skip eth/catalyst tests (#937)

* skip eth/catalyst tests

* Update api_test.go

---------

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
Jonas Theis 2024-07-29 13:36:01 +08:00 committed by GitHub
parent 989ecb2133
commit e6705cea99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 0 deletions

View file

@ -102,6 +102,8 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) {
} }
func TestEth2AssembleBlock(t *testing.T) { func TestEth2AssembleBlock(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, blocks := generateMergeChain(10, false) genesis, blocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, blocks) n, ethservice := startEthService(t, genesis, blocks)
defer n.Close() defer n.Close()
@ -141,6 +143,8 @@ func assembleWithTransactions(api *ConsensusAPI, parentHash common.Hash, params
} }
func TestEth2AssembleBlockWithAnotherBlocksTxs(t *testing.T) { func TestEth2AssembleBlockWithAnotherBlocksTxs(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, blocks := generateMergeChain(10, false) genesis, blocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, blocks[:9]) n, ethservice := startEthService(t, genesis, blocks[:9])
defer n.Close() defer n.Close()
@ -179,6 +183,8 @@ func TestSetHeadBeforeTotalDifficulty(t *testing.T) {
} }
func TestEth2PrepareAndGetPayload(t *testing.T) { func TestEth2PrepareAndGetPayload(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, blocks := generateMergeChain(10, false) genesis, blocks := generateMergeChain(10, false)
// We need to properly set the terminal total difficulty // We need to properly set the terminal total difficulty
genesis.Config.TerminalTotalDifficulty.Sub(genesis.Config.TerminalTotalDifficulty, blocks[9].Difficulty()) genesis.Config.TerminalTotalDifficulty.Sub(genesis.Config.TerminalTotalDifficulty, blocks[9].Difficulty())
@ -291,6 +297,8 @@ func TestInvalidPayloadTimestamp(t *testing.T) {
} }
func TestEth2NewBlock(t *testing.T) { func TestEth2NewBlock(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -468,6 +476,8 @@ func startEthService(t *testing.T, genesis *core.Genesis, blocks []*types.Block)
} }
func TestFullAPI(t *testing.T) { func TestFullAPI(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -587,6 +597,8 @@ We expect
P1'' P1''
*/ */
func TestNewPayloadOnInvalidChain(t *testing.T) { func TestNewPayloadOnInvalidChain(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -683,6 +695,8 @@ func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.Pay
} }
func TestEmptyBlocks(t *testing.T) { func TestEmptyBlocks(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -798,6 +812,8 @@ func decodeTransactions(enc [][]byte) ([]*types.Transaction, error) {
} }
func TestTrickRemoteBlockCache(t *testing.T) { func TestTrickRemoteBlockCache(t *testing.T) {
t.Skip("we are not using catalyst API currently")
// Setup two nodes // Setup two nodes
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
nodeA, ethserviceA := startEthService(t, genesis, preMergeBlocks) nodeA, ethserviceA := startEthService(t, genesis, preMergeBlocks)
@ -862,6 +878,8 @@ func TestTrickRemoteBlockCache(t *testing.T) {
} }
func TestInvalidBloom(t *testing.T) { func TestInvalidBloom(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
ethservice.Merger().ReachTTD() ethservice.Merger().ReachTTD()
@ -886,6 +904,8 @@ func TestInvalidBloom(t *testing.T) {
} }
func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) { func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(100, false) genesis, preMergeBlocks := generateMergeChain(100, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -953,6 +973,8 @@ func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) {
// newPayLoad and forkchoiceUpdate. This is to test that the api behaves // newPayLoad and forkchoiceUpdate. This is to test that the api behaves
// well even of the caller is not being 'serial'. // well even of the caller is not being 'serial'.
func TestSimultaneousNewBlock(t *testing.T) { func TestSimultaneousNewBlock(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, preMergeBlocks := generateMergeChain(10, false) genesis, preMergeBlocks := generateMergeChain(10, false)
n, ethservice := startEthService(t, genesis, preMergeBlocks) n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close() defer n.Close()
@ -1040,6 +1062,8 @@ func TestSimultaneousNewBlock(t *testing.T) {
// TestWithdrawals creates and verifies two post-Shanghai blocks. The first // TestWithdrawals creates and verifies two post-Shanghai blocks. The first
// includes zero withdrawals and the second includes two. // includes zero withdrawals and the second includes two.
func TestWithdrawals(t *testing.T) { func TestWithdrawals(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, blocks := generateMergeChain(10, true) genesis, blocks := generateMergeChain(10, true)
// Set shanghai time to last block + 5 seconds (first post-merge block) // Set shanghai time to last block + 5 seconds (first post-merge block)
time := blocks[len(blocks)-1].Time() + 5 time := blocks[len(blocks)-1].Time() + 5
@ -1156,6 +1180,8 @@ func TestWithdrawals(t *testing.T) {
} }
func TestNilWithdrawals(t *testing.T) { func TestNilWithdrawals(t *testing.T) {
t.Skip("we are not using catalyst API currently")
genesis, blocks := generateMergeChain(10, true) genesis, blocks := generateMergeChain(10, true)
// Set shanghai time to last block + 4 seconds (first post-merge block) // Set shanghai time to last block + 4 seconds (first post-merge block)
time := blocks[len(blocks)-1].Time() + 4 time := blocks[len(blocks)-1].Time() + 4
@ -1323,6 +1349,8 @@ func allBodies(blocks []*types.Block) []*types.Body {
} }
func TestGetBlockBodiesByHash(t *testing.T) { func TestGetBlockBodiesByHash(t *testing.T) {
t.Skip("we are not using catalyst API currently")
node, eth, blocks := setupBodies(t) node, eth, blocks := setupBodies(t)
api := NewConsensusAPI(eth) api := NewConsensusAPI(eth)
defer node.Close() defer node.Close()
@ -1379,6 +1407,8 @@ func TestGetBlockBodiesByHash(t *testing.T) {
} }
func TestGetBlockBodiesByRange(t *testing.T) { func TestGetBlockBodiesByRange(t *testing.T) {
t.Skip("we are not using catalyst API currently")
node, eth, blocks := setupBodies(t) node, eth, blocks := setupBodies(t)
api := NewConsensusAPI(eth) api := NewConsensusAPI(eth)
defer node.Close() defer node.Close()
@ -1460,6 +1490,8 @@ func TestGetBlockBodiesByRange(t *testing.T) {
} }
func TestGetBlockBodiesByRangeInvalidParams(t *testing.T) { func TestGetBlockBodiesByRangeInvalidParams(t *testing.T) {
t.Skip("we are not using catalyst API currently")
node, eth, _ := setupBodies(t) node, eth, _ := setupBodies(t)
api := NewConsensusAPI(eth) api := NewConsensusAPI(eth)
defer node.Close() defer node.Close()
@ -1562,6 +1594,8 @@ func TestBlockToPayloadWithBlobs(t *testing.T) {
// This checks that beaconRoot is applied to the state from the engine API. // This checks that beaconRoot is applied to the state from the engine API.
func TestParentBeaconBlockRoot(t *testing.T) { func TestParentBeaconBlockRoot(t *testing.T) {
t.Skip("we are not using catalyst API currently")
log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true)))) log.Root().SetHandler(log.LvlFilterHandler(log.LvlTrace, log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))
genesis, blocks := generateMergeChain(10, true) genesis, blocks := generateMergeChain(10, true)

View file

@ -72,6 +72,8 @@ func startSimulatedBeaconEthService(t *testing.T, genesis *core.Genesis) (*node.
// send 20 transactions, >10 withdrawals and ensure they are included in order // send 20 transactions, >10 withdrawals and ensure they are included in order
// send enough transactions to fill multiple blocks // send enough transactions to fill multiple blocks
func TestSimulatedBeaconSendWithdrawals(t *testing.T) { func TestSimulatedBeaconSendWithdrawals(t *testing.T) {
t.Skip("we are not using catalyst API currently")
var withdrawals []types.Withdrawal var withdrawals []types.Withdrawal
txs := make(map[common.Hash]types.Transaction) txs := make(map[common.Hash]types.Transaction)