From 60a2c0b9a96b7813dbaa7227233a5bb83f120ff4 Mon Sep 17 00:00:00 2001 From: "yzb@example.cn" Date: Thu, 29 Feb 2024 15:53:35 +0800 Subject: [PATCH] test:delete-no-use-param --- internal/ethapi/api_test.go | 4 ++-- miner/payload_building_test.go | 2 +- miner/worker_test.go | 14 +++++++------- trie/stacktrie_test.go | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 8ffa638a6b..1f2ee7ee53 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -361,7 +361,7 @@ func allTransactionTypes(addr common.Address, config *params.ChainConfig) []txDa } } -func allBlobTxs(addr common.Address, config *params.ChainConfig) []txData { +func allBlobTxs(addr common.Address, _ *params.ChainConfig) []txData { return []txData{ { Tx: &types.BlobTx{ @@ -1244,7 +1244,7 @@ func TestFillBlobTransaction(t *testing.T) { if len(tc.err) > 0 { if err == nil { t.Fatalf("missing error. want: %s", tc.err) - } else if err != nil && err.Error() != tc.err { + } else if err.Error() != tc.err { t.Fatalf("error mismatch. want: %s, have: %s", tc.err, err.Error()) } return diff --git a/miner/payload_building_test.go b/miner/payload_building_test.go index 708072b5ec..ebc93a9090 100644 --- a/miner/payload_building_test.go +++ b/miner/payload_building_test.go @@ -35,7 +35,7 @@ func TestBuildPayload(t *testing.T) { db = rawdb.NewMemoryDatabase() recipient = common.HexToAddress("0xdeadbeef") ) - w, b := newTestWorker(t, params.TestChainConfig, ethash.NewFaker(), db, 0) + w, b := newTestWorker(t, params.TestChainConfig, ethash.NewFaker(), db) defer w.close() timestamp := uint64(time.Now().Unix()) diff --git a/miner/worker_test.go b/miner/worker_test.go index 9dba12ae51..36112a8c4f 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -114,7 +114,7 @@ type testWorkerBackend struct { genesis *core.Genesis } -func newTestWorkerBackend(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database, n int) *testWorkerBackend { +func newTestWorkerBackend(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database) *testWorkerBackend { var gspec = &core.Genesis{ Config: chainConfig, Alloc: types.GenesisAlloc{testBankAddress: {Balance: testBankFunds}}, @@ -159,8 +159,8 @@ func (b *testWorkerBackend) newRandomTx(creation bool) *types.Transaction { return tx } -func newTestWorker(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database, blocks int) (*worker, *testWorkerBackend) { - backend := newTestWorkerBackend(t, chainConfig, engine, db, blocks) +func newTestWorker(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine, db ethdb.Database) (*worker, *testWorkerBackend) { + backend := newTestWorkerBackend(t, chainConfig, engine, db) backend.txPool.Add(pendingTxs, true, false) w := newWorker(testConfig, chainConfig, engine, backend, new(event.TypeMux), nil, false) w.setEtherbase(testBankAddress) @@ -176,7 +176,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) + w, b := newTestWorker(t, &config, engine, db) defer w.close() // This test chain imports the mined blocks. @@ -223,7 +223,7 @@ func TestEmptyWorkClique(t *testing.T) { func testEmptyWork(t *testing.T, chainConfig *params.ChainConfig, engine consensus.Engine) { defer engine.Close() - w, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase(), 0) + w, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase()) defer w.close() taskCh := make(chan struct{}, 2) @@ -268,7 +268,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) + w, _ := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase()) defer w.close() w.skipSealHook = func(task *task) bool { @@ -372,7 +372,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) + w, b := newTestWorker(t, chainConfig, engine, rawdb.NewMemoryDatabase()) defer w.close() w.setExtra([]byte{0x01, 0x02}) diff --git a/trie/stacktrie_test.go b/trie/stacktrie_test.go index 3a0e1cb260..242d5d15a4 100644 --- a/trie/stacktrie_test.go +++ b/trie/stacktrie_test.go @@ -381,7 +381,7 @@ func TestStacktrieNotModifyValues(t *testing.T) { } } -func buildPartialTree(entries []*kv, t *testing.T) map[string]common.Hash { +func buildPartialTree(entries []*kv) map[string]common.Hash { var ( options = NewStackTrieOptions() nodes = make(map[string]common.Hash) @@ -456,7 +456,7 @@ func TestPartialStackTrie(t *testing.T) { tr.Commit() for j := 0; j < 100; j++ { - for path, hash := range buildPartialTree(entries, t) { + for path, hash := range buildPartialTree(entries) { if nodes[path] != hash { t.Errorf("%v, want %x, got %x", []byte(path), nodes[path], hash) }