From a0d10ec572bee95d32cd485eb723c72326674ec6 Mon Sep 17 00:00:00 2001 From: Arpit Temani Date: Sat, 23 Sep 2023 22:02:37 +0530 Subject: [PATCH] fix tests --- graphql/graphql_test.go | 2 -- miner/payload_building_test.go | 2 +- miner/worker_test.go | 23 ++++++++++++----------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go index b129c75dd5..e72c436253 100644 --- a/graphql/graphql_test.go +++ b/graphql/graphql_test.go @@ -270,8 +270,6 @@ func TestGraphQLHTTPOnSamePort_GQLRequest_Unsuccessful(t *testing.T) { // nolint:typecheck func TestGraphQLConcurrentResolvers(t *testing.T) { - t.Parallel() - var ( key, _ = crypto.GenerateKey() addr = crypto.PubkeyToAddress(key.PublicKey) diff --git a/miner/payload_building_test.go b/miner/payload_building_test.go index 821d0854af..02f1008f4c 100644 --- a/miner/payload_building_test.go +++ b/miner/payload_building_test.go @@ -37,7 +37,7 @@ func TestBuildPayload(t *testing.T) { recipient = common.HexToAddress("0xdeadbeef") ) - w, b, _ := newTestWorker(t, params.TestChainConfig, ethash.NewFaker(), db, 0, false, 0, 0) + w, b, _ := newTestWorker(t, params.TestChainConfig, ethash.NewFaker(), db, false, 0, 0) defer w.close() timestamp := uint64(time.Now().Unix()) diff --git a/miner/worker_test.go b/miner/worker_test.go index 68f752d281..fe574b0cde 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -89,7 +89,7 @@ func testGenerateBlockAndImport(t *testing.T, isClique bool, isBor bool) { defer engine.Close() - w, b, _ := newTestWorker(t, &chainConfig, engine, db, 0, false, 0, 0) + w, b, _ := newTestWorker(t, &chainConfig, engine, db, false, 0, 0) defer w.close() // This test chain imports the mined blocks. @@ -118,7 +118,7 @@ func testGenerateBlockAndImport(t *testing.T, isClique bool, isBor bool) { t.Fatal("while adding a local transaction", err) } - err = b.txPool.Add([]*txpool.Transaction{{Tx: b.newRandomTx(false)}}, true, false)[0] + err = b.txPool.Add([]*txpool.Transaction{{Tx: b.newRandomTx(false)}}, false, false)[0] if err != nil { t.Fatal("while adding a remote transaction", err) } @@ -348,7 +348,7 @@ func (b *testWorkerBackend) newStorageContractCallTx(to common.Address, nonce ui return tx } -func newTestWorker(t TensingObject, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database, blocks int, noempty bool, delay uint, opcodeDelay uint) (*worker, *testWorkerBackend, func()) { +func newTestWorker(t TensingObject, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database, noempty bool, delay uint, opcodeDelay uint) (*worker, *testWorkerBackend, func()) { backend := newTestWorkerBackend(t, chainConfig, engine, db) backend.txPool.Add(pendingTxs, true, false) var w *worker @@ -361,6 +361,7 @@ func newTestWorker(t TensingObject, chainConfig *params.ChainConfig, engine cons } w.setEtherbase(testBankAddress) // enable empty blocks + w.noempty.Store(noempty) return w, backend, w.close } @@ -372,7 +373,7 @@ func TestGenerateAndImportBlock(t *testing.T) { config.Clique = ¶ms.CliqueConfig{Period: 1, Epoch: 30000} engine := clique.New(config.Clique, db) - w, b, _ := newTestWorker(t, &config, engine, db, 0, false, 0, 0) + w, b, _ := newTestWorker(t, &config, engine, db, false, 0, 0) defer w.close() // This test chain imports the mined blocks. @@ -450,7 +451,7 @@ func testEmptyWork(t *testing.T, chainConfig *params.ChainConfig, engine consens t.Helper() defer engine.Close() - w, _, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, _, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), false, 0, 0) defer w.close() taskCh := make(chan struct{}, 2) @@ -497,7 +498,7 @@ func TestAdjustIntervalClique(t *testing.T) { func testAdjustInterval(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine) { defer engine.Close() - w, _, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, _, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), false, 0, 0) defer w.close() w.skipSealHook = func(task *task) bool { @@ -599,7 +600,7 @@ func TestGetSealingWorkPostMerge(t *testing.T) { func testGetSealingWork(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine) { defer engine.Close() - w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), false, 0, 0) defer w.close() w.setExtra([]byte{0x01, 0x02}) @@ -759,7 +760,7 @@ func testCommitInterruptExperimentBorContract(t *testing.T, delay uint, txCount engine, _ = getFakeBorFromConfig(t, chainConfig) - w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), true, delay, opcodeDelay) defer w.close() // nonce 0 tx @@ -813,7 +814,7 @@ func testCommitInterruptExperimentBor(t *testing.T, delay uint, txCount int, opc engine, ctrl = getFakeBorFromConfig(t, chainConfig) - w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, b, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), true, delay, opcodeDelay) defer func() { w.close() engine.Close() @@ -877,7 +878,7 @@ func BenchmarkBorMining(b *testing.B) { chainConfig.LondonBlock = big.NewInt(0) - w, back, _ := newTestWorker(b, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, back, _ := newTestWorker(b, chainConfig, engine, rawdb.NewMemoryDatabase(), false, 0, 0) defer w.close() chain, _ := core.NewBlockChain(rawdb.NewMemoryDatabase(), nil, back.genesis, nil, engine, vm.Config{}, nil, nil, nil) @@ -974,7 +975,7 @@ func BenchmarkBorMiningBlockSTMMetadata(b *testing.B) { chainConfig.LondonBlock = big.NewInt(0) - w, back, _ := newTestWorker(b, chainConfig, engine, rawdb.NewMemoryDatabase(), 0, false, 0, 0) + w, back, _ := newTestWorker(b, chainConfig, engine, rawdb.NewMemoryDatabase(), false, 0, 0) defer w.close() // This test chain imports the mined blocks.