From e6705cea9959e027082b495a4e740a815a8b6f37 Mon Sep 17 00:00:00 2001 From: Jonas Theis <4181434+jonastheis@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:36:01 +0800 Subject: [PATCH] skip eth/catalyst tests (#937) * skip eth/catalyst tests * Update api_test.go --------- Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> --- eth/catalyst/api_test.go | 34 +++++++++++++++++++++++++++ eth/catalyst/simulated_beacon_test.go | 2 ++ 2 files changed, 36 insertions(+) diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go index 1fe68c5383..f2a18cbb4e 100644 --- a/eth/catalyst/api_test.go +++ b/eth/catalyst/api_test.go @@ -102,6 +102,8 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) { } func TestEth2AssembleBlock(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, blocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, blocks) defer n.Close() @@ -141,6 +143,8 @@ func assembleWithTransactions(api *ConsensusAPI, parentHash common.Hash, params } func TestEth2AssembleBlockWithAnotherBlocksTxs(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, blocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, blocks[:9]) defer n.Close() @@ -179,6 +183,8 @@ func TestSetHeadBeforeTotalDifficulty(t *testing.T) { } func TestEth2PrepareAndGetPayload(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, blocks := generateMergeChain(10, false) // We need to properly set the terminal total 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) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -468,6 +476,8 @@ func startEthService(t *testing.T, genesis *core.Genesis, blocks []*types.Block) } func TestFullAPI(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -587,6 +597,8 @@ We expect └── P1'' */ func TestNewPayloadOnInvalidChain(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -683,6 +695,8 @@ func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.Pay } func TestEmptyBlocks(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -798,6 +812,8 @@ func decodeTransactions(enc [][]byte) ([]*types.Transaction, error) { } func TestTrickRemoteBlockCache(t *testing.T) { + t.Skip("we are not using catalyst API currently") + // Setup two nodes genesis, preMergeBlocks := generateMergeChain(10, false) nodeA, ethserviceA := startEthService(t, genesis, preMergeBlocks) @@ -862,6 +878,8 @@ func TestTrickRemoteBlockCache(t *testing.T) { } func TestInvalidBloom(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) ethservice.Merger().ReachTTD() @@ -886,6 +904,8 @@ func TestInvalidBloom(t *testing.T) { } func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(100, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -953,6 +973,8 @@ func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) { // newPayLoad and forkchoiceUpdate. This is to test that the api behaves // well even of the caller is not being 'serial'. func TestSimultaneousNewBlock(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, preMergeBlocks := generateMergeChain(10, false) n, ethservice := startEthService(t, genesis, preMergeBlocks) defer n.Close() @@ -1040,6 +1062,8 @@ func TestSimultaneousNewBlock(t *testing.T) { // TestWithdrawals creates and verifies two post-Shanghai blocks. The first // includes zero withdrawals and the second includes two. func TestWithdrawals(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, blocks := generateMergeChain(10, true) // Set shanghai time to last block + 5 seconds (first post-merge block) time := blocks[len(blocks)-1].Time() + 5 @@ -1156,6 +1180,8 @@ func TestWithdrawals(t *testing.T) { } func TestNilWithdrawals(t *testing.T) { + t.Skip("we are not using catalyst API currently") + genesis, blocks := generateMergeChain(10, true) // Set shanghai time to last block + 4 seconds (first post-merge block) time := blocks[len(blocks)-1].Time() + 4 @@ -1323,6 +1349,8 @@ func allBodies(blocks []*types.Block) []*types.Body { } func TestGetBlockBodiesByHash(t *testing.T) { + t.Skip("we are not using catalyst API currently") + node, eth, blocks := setupBodies(t) api := NewConsensusAPI(eth) defer node.Close() @@ -1379,6 +1407,8 @@ func TestGetBlockBodiesByHash(t *testing.T) { } func TestGetBlockBodiesByRange(t *testing.T) { + t.Skip("we are not using catalyst API currently") + node, eth, blocks := setupBodies(t) api := NewConsensusAPI(eth) defer node.Close() @@ -1460,6 +1490,8 @@ func TestGetBlockBodiesByRange(t *testing.T) { } func TestGetBlockBodiesByRangeInvalidParams(t *testing.T) { + t.Skip("we are not using catalyst API currently") + node, eth, _ := setupBodies(t) api := NewConsensusAPI(eth) 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. 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)))) genesis, blocks := generateMergeChain(10, true) diff --git a/eth/catalyst/simulated_beacon_test.go b/eth/catalyst/simulated_beacon_test.go index bf0bdff358..aff6268fea 100644 --- a/eth/catalyst/simulated_beacon_test.go +++ b/eth/catalyst/simulated_beacon_test.go @@ -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 enough transactions to fill multiple blocks func TestSimulatedBeaconSendWithdrawals(t *testing.T) { + t.Skip("we are not using catalyst API currently") + var withdrawals []types.Withdrawal txs := make(map[common.Hash]types.Transaction)