style: fix based on feedback

alarso16 · alarso16 · commit 3233835a5afc · 2025-09-04T11:09:34.000-04:00
diff --git a/core/blockchain_ext_test.go b/core/blockchain_ext_test.go
@@ -925,7 +925,7 @@ func EmptyBlocksTest(t *testing.T, create createFunc) {
 	blockchain.DrainAcceptorQueue()
 
 	// Nothing to assert about the state
-	checkState := func(_ *state.StateDB) error {
+	checkState := func(*state.StateDB) error {
 		return nil
 	}
 
diff --git a/core/extstate/firewood_database.go b/core/extstate/firewood_database.go
@@ -29,12 +29,12 @@ func (db *firewoodAccessorDb) OpenTrie(root common.Hash) (state.Trie, error) {
 }
 
 // OpenStorageTrie opens a wrapped version of the account trie.
-func (*firewoodAccessorDb) OpenStorageTrie(_ common.Hash, _ common.Address, root common.Hash, self state.Trie) (state.Trie, error) {
+func (*firewoodAccessorDb) OpenStorageTrie(_ common.Hash, _ common.Address, accountRoot common.Hash, self state.Trie) (state.Trie, error) {
 	accountTrie, ok := self.(*firewood.AccountTrie)
 	if !ok {
 		return nil, fmt.Errorf("Invalid account trie type: %T", self)
 	}
-	return firewood.NewStorageTrie(accountTrie, root)
+	return firewood.NewStorageTrie(accountTrie, accountRoot)
 }
 
 // CopyTrie returns a deep copy of the given trie.
diff --git a/core/fifo_cache.go b/core/fifo_cache.go
@@ -65,7 +65,7 @@ func (f *BufferFIFOCache[K, V]) remove(key K) error {
 
 type NoOpFIFOCache[K comparable, V any] struct{}
 
-func (*NoOpFIFOCache[K, V]) Put(_ K, _ V) {}
-func (*NoOpFIFOCache[K, V]) Get(_ K) (V, bool) {
+func (*NoOpFIFOCache[K, V]) Put(K, V) {}
+func (*NoOpFIFOCache[K, V]) Get(K) (V, bool) {
 	return *new(V), false
 }
diff --git a/core/state_manager_test.go b/core/state_manager_test.go
@@ -34,7 +34,7 @@ func (*MockTrieDB) Size() (common.StorageSize, common.StorageSize, common.Storag
 	return 0, 0, 0
 }
 
-func (*MockTrieDB) Cap(_ common.StorageSize) error {
+func (*MockTrieDB) Cap(common.StorageSize) error {
 	return nil
 }
 
diff --git a/eth/api_debug.go b/eth/api_debug.go
@@ -102,7 +102,7 @@ func (api *DebugAPI) Preimage(ctx context.Context, hash common.Hash) (hexutil.By
 // and returns them as a JSON list of block hashes.
 func (api *DebugAPI) GetBadBlocks(ctx context.Context) ([]*ethapi.BadBlockArgs, error) {
 	internalAPI := ethapi.NewBlockChainAPI(api.eth.APIBackend)
-	return internalAPI.GetBadBlocks()
+	return internalAPI.GetBadBlocks(ctx)
 }
 
 // AccountRangeMaxResults is the maximum number of results to be returned per call
diff --git a/internal/ethapi/api_extra.go b/internal/ethapi/api_extra.go
@@ -13,6 +13,7 @@ import (
 	"github.com/ava-labs/libevm/rlp"
 
 	"github.com/ava-labs/coreth/core"
+	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/rpc"
 )
 
@@ -23,6 +24,11 @@ type DetailedExecutionResult struct {
 	ReturnData hexutil.Bytes `json:"returnData"` // Data from evm(function result or data supplied with revert opcode)
 }
 
+// GetChainConfig returns the chain config.
+func (api *BlockChainAPI) GetChainConfig(context.Context) *params.ChainConfig {
+	return api.b.ChainConfig()
+}
+
 // CallDetailed performs the same call as Call, but returns the full context
 func (s *BlockChainAPI) CallDetailed(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride) (*DetailedExecutionResult, error) {
 	result, err := DoCall(ctx, s.b, args, blockNrOrHash, overrides, nil, s.b.RPCEVMTimeout(), s.b.RPCGasCap())
@@ -63,7 +69,7 @@ type BadBlockArgs struct {
 
 // GetBadBlocks returns a list of the last 'bad blocks' that the client has seen on the network
 // and returns them as a JSON list of block hashes.
-func (s *BlockChainAPI) GetBadBlocks() ([]*BadBlockArgs, error) {
+func (s *BlockChainAPI) GetBadBlocks(context.Context) ([]*BadBlockArgs, error) {
 	var (
 		badBlocks, reasons = s.b.BadBlocks()
 		results            = make([]*BadBlockArgs, 0, len(badBlocks))
diff --git a/network/network_test.go b/network/network_test.go
@@ -134,10 +134,10 @@ func TestRequestAnyRequestsRoutingAndResponse(t *testing.T) {
 func TestAppRequestOnCtxCancellation(t *testing.T) {
 	codecManager := buildCodec(t, HelloRequest{}, HelloResponse{})
 	sender := testAppSender{
-		sendAppRequestFn: func(_ context.Context, _ set.Set[ids.NodeID], _ uint32, _ []byte) error {
+		sendAppRequestFn: func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {
 			return nil
 		},
-		sendAppResponseFn: func(_ ids.NodeID, _ uint32, _ []byte) error {
+		sendAppResponseFn: func(ids.NodeID, uint32, []byte) error {
 			return nil
 		},
 	}
@@ -263,7 +263,7 @@ func TestAppRequestOnShutdown(t *testing.T) {
 		called bool
 	)
 	sender := testAppSender{
-		sendAppRequestFn: func(_ context.Context, _ set.Set[ids.NodeID], _ uint32, _ []byte) error {
+		sendAppRequestFn: func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {
 			wg.Add(1)
 			go func() {
 				called = true
@@ -319,7 +319,7 @@ func TestSyncedAppRequestAnyOnCtxCancellation(t *testing.T) {
 			}
 			return nil
 		},
-		sendAppResponseFn: func(_ ids.NodeID, _ uint32, _ []byte) error {
+		sendAppResponseFn: func(ids.NodeID, uint32, []byte) error {
 			return nil
 		},
 	}
@@ -639,7 +639,7 @@ func (t testAppSender) SendAppGossip(_ context.Context, config common.SendConfig
 	return t.sendAppGossipFn(config, message)
 }
 
-func (testAppSender) SendAppError(_ context.Context, _ ids.NodeID, _ uint32, _ int32, _ string) error {
+func (testAppSender) SendAppError(context.Context, ids.NodeID, uint32, int32, string) error {
 	panic("not implemented")
 }
 
@@ -751,12 +751,12 @@ type testSDKHandler struct {
 	appRequested bool
 }
 
-func (*testSDKHandler) AppGossip(_ context.Context, _ ids.NodeID, _ []byte) {
+func (*testSDKHandler) AppGossip(context.Context, ids.NodeID, []byte) {
 	// TODO implement me
 	panic("implement me")
 }
 
-func (t *testSDKHandler) AppRequest(_ context.Context, _ ids.NodeID, _ time.Time, _ []byte) ([]byte, *common.AppError) {
+func (t *testSDKHandler) AppRequest(context.Context, ids.NodeID, time.Time, []byte) ([]byte, *common.AppError) {
 	t.appRequested = true
 	return nil, nil
 }
diff --git a/params/config_libevm.go b/params/config_libevm.go
@@ -32,7 +32,9 @@ var payloads ethparams.ExtraPayloads[*extras.ChainConfig, RulesExtra]
 // constructRulesExtra acts as an adjunct to the [params.ChainConfig.Rules]
 // method. Its primary purpose is to construct the extra payload for the
 // [params.Rules] but it MAY also modify the [params.Rules].
-func constructRulesExtra(_ *ethparams.ChainConfig, _ *ethparams.Rules, cEx *extras.ChainConfig, _ *big.Int, _ bool, timestamp uint64) RulesExtra {
+//
+//nolint:revive
+func constructRulesExtra(c *ethparams.ChainConfig, r *ethparams.Rules, cEx *extras.ChainConfig, blockNum *big.Int, isMerge bool, timestamp uint64) RulesExtra {
 	var rules RulesExtra
 	if cEx == nil {
 		return rules
diff --git a/params/extras/config.go b/params/extras/config.go
@@ -110,7 +110,8 @@ type ChainConfig struct {
 	UpgradeConfig `json:"-"` // Config specified in upgradeBytes (avalanche network upgrades or enable/disabling precompiles). Not serialized.
 }
 
-func (c *ChainConfig) CheckConfigCompatible(newcfg_ *ethparams.ChainConfig, _ *big.Int, headTimestamp uint64) *ethparams.ConfigCompatError {
+//nolint:revive
+func (c *ChainConfig) CheckConfigCompatible(newcfg_ *ethparams.ChainConfig, headNumber *big.Int, headTimestamp uint64) *ethparams.ConfigCompatError {
 	if c == nil {
 		return nil
 	}
diff --git a/plugin/evm/admin.go b/plugin/evm/admin.go
@@ -28,7 +28,7 @@ func NewAdminService(vm *VM, performanceDir string) *Admin {
 }
 
 // StartCPUProfiler starts a cpu profile writing to the specified file
-func (p *Admin) StartCPUProfiler(_ *http.Request, _ *struct{}, _ *api.EmptyReply) error {
+func (p *Admin) StartCPUProfiler(*http.Request, *struct{}, *api.EmptyReply) error {
 	log.Info("Admin: StartCPUProfiler called")
 
 	p.vm.ctx.Lock.Lock()
@@ -38,7 +38,7 @@ func (p *Admin) StartCPUProfiler(_ *http.Request, _ *struct{}, _ *api.EmptyReply
 }
 
 // StopCPUProfiler stops the cpu profile
-func (p *Admin) StopCPUProfiler(_ *http.Request, _ *struct{}, _ *api.EmptyReply) error {
+func (p *Admin) StopCPUProfiler(*http.Request, *struct{}, *api.EmptyReply) error {
 	log.Info("Admin: StopCPUProfiler called")
 
 	p.vm.ctx.Lock.Lock()
@@ -48,7 +48,7 @@ func (p *Admin) StopCPUProfiler(_ *http.Request, _ *struct{}, _ *api.EmptyReply)
 }
 
 // MemoryProfile runs a memory profile writing to the specified file
-func (p *Admin) MemoryProfile(_ *http.Request, _ *struct{}, _ *api.EmptyReply) error {
+func (p *Admin) MemoryProfile(*http.Request, *struct{}, *api.EmptyReply) error {
 	log.Info("Admin: MemoryProfile called")
 
 	p.vm.ctx.Lock.Lock()
@@ -58,7 +58,7 @@ func (p *Admin) MemoryProfile(_ *http.Request, _ *struct{}, _ *api.EmptyReply) e
 }
 
 // LockProfile runs a mutex profile writing to the specified file
-func (p *Admin) LockProfile(_ *http.Request, _ *struct{}, _ *api.EmptyReply) error {
+func (p *Admin) LockProfile(*http.Request, *struct{}, *api.EmptyReply) error {
 	log.Info("Admin: LockProfile called")
 
 	p.vm.ctx.Lock.Lock()
diff --git a/plugin/evm/atomic/atomictest/tx.go b/plugin/evm/atomic/atomictest/tx.go
@@ -56,10 +56,10 @@ type TestUnsignedTx struct {
 }
 
 // GasUsed implements the UnsignedAtomicTx interface
-func (t *TestUnsignedTx) GasUsed(_ bool) (uint64, error) { return t.GasUsedV, nil }
+func (t *TestUnsignedTx) GasUsed(bool) (uint64, error) { return t.GasUsedV, nil }
 
 // Verify implements the UnsignedAtomicTx interface
-func (t *TestUnsignedTx) Verify(_ *snow.Context, _ extras.Rules) error { return t.VerifyV }
+func (t *TestUnsignedTx) Verify(*snow.Context, extras.Rules) error { return t.VerifyV }
 
 // AtomicOps implements the UnsignedAtomicTx interface
 func (t *TestUnsignedTx) AtomicOps() (ids.ID, *avalancheatomic.Requests, error) {
@@ -73,7 +73,7 @@ func (*TestUnsignedTx) Initialize(_, _ []byte) {}
 func (t *TestUnsignedTx) ID() ids.ID { return t.IDV }
 
 // Burned implements the UnsignedAtomicTx interface
-func (t *TestUnsignedTx) Burned(_ ids.ID) (uint64, error) { return t.BurnedV, nil }
+func (t *TestUnsignedTx) Burned(ids.ID) (uint64, error) { return t.BurnedV, nil }
 
 // Bytes implements the UnsignedAtomicTx interface
 func (t *TestUnsignedTx) Bytes() []byte { return t.UnsignedBytesV }
@@ -85,12 +85,12 @@ func (t *TestUnsignedTx) SignedBytes() []byte { return t.SignedBytesV }
 func (t *TestUnsignedTx) InputUTXOs() set.Set[ids.ID] { return t.InputUTXOsV }
 
 // Visit implements the UnsignedAtomicTx interface
-func (t *TestUnsignedTx) Visit(_ atomic.Visitor) error {
+func (t *TestUnsignedTx) Visit(atomic.Visitor) error {
 	return t.VisitV
 }
 
 // EVMStateTransfer implements the UnsignedAtomicTx interface
-func (t *TestUnsignedTx) EVMStateTransfer(_ *snow.Context, _ atomic.StateDB) error {
+func (t *TestUnsignedTx) EVMStateTransfer(*snow.Context, atomic.StateDB) error {
 	return t.EVMStateTransferV
 }
 
diff --git a/plugin/evm/atomic/gossip.go b/plugin/evm/atomic/gossip.go
@@ -9,10 +9,10 @@ var _ gossip.Marshaller[*Tx] = (*TxMarshaller)(nil)
 
 type TxMarshaller struct{}
 
-func (_ *TxMarshaller) MarshalGossip(tx *Tx) ([]byte, error) {
+func (*TxMarshaller) MarshalGossip(tx *Tx) ([]byte, error) {
 	return tx.SignedBytes(), nil
 }
 
-func (_ *TxMarshaller) UnmarshalGossip(bytes []byte) (*Tx, error) {
+func (*TxMarshaller) UnmarshalGossip(bytes []byte) (*Tx, error) {
 	return ExtractAtomicTx(bytes, Codec)
 }
diff --git a/plugin/evm/atomic/sync/leaf_handler.go b/plugin/evm/atomic/sync/leaf_handler.go
@@ -25,7 +25,7 @@ var (
 
 type uninitializedHandler struct{}
 
-func (*uninitializedHandler) OnLeafsRequest(_ context.Context, _ ids.NodeID, _ uint32, _ message.LeafsRequest) ([]byte, error) {
+func (*uninitializedHandler) OnLeafsRequest(context.Context, ids.NodeID, uint32, message.LeafsRequest) ([]byte, error) {
 	return nil, errUninitialized
 }
 
diff --git a/plugin/evm/customrawdb/database_ext_test.go b/plugin/evm/customrawdb/database_ext_test.go
@@ -77,7 +77,7 @@ func (s *stubDatabase) NewIterator(_, _ []byte) ethdb.Iterator {
 }
 
 // AncientSize is used in [InspectDatabase] to determine the ancient sizes.
-func (*stubDatabase) AncientSize(_ string) (uint64, error) {
+func (*stubDatabase) AncientSize(string) (uint64, error) {
 	return 0, nil
 }
 
@@ -94,11 +94,11 @@ func (s *stubDatabase) Put(key, value []byte) error {
 	return nil
 }
 
-func (*stubDatabase) Get(_ []byte) ([]byte, error) {
+func (*stubDatabase) Get([]byte) ([]byte, error) {
 	return nil, nil
 }
 
-func (*stubDatabase) ReadAncients(_ func(ethdb.AncientReaderOp) error) error {
+func (*stubDatabase) ReadAncients(func(ethdb.AncientReaderOp) error) error {
 	return nil
 }
 
diff --git a/plugin/evm/health.go b/plugin/evm/health.go
@@ -8,7 +8,7 @@ import "context"
 // Health returns nil if this chain is healthy.
 // Also returns details, which should be one of:
 // string, []byte, map[string]string
-func (*VM) HealthCheck(_ context.Context) (interface{}, error) {
+func (*VM) HealthCheck(context.Context) (interface{}, error) {
 	// TODO perform actual health check
 	return nil, nil
 }
diff --git a/plugin/evm/message/handler.go b/plugin/evm/message/handler.go
@@ -32,14 +32,14 @@ type ResponseHandler interface {
 
 type NoopRequestHandler struct{}
 
-func (NoopRequestHandler) HandleLeafsRequest(_ context.Context, _ ids.NodeID, _ uint32, _ LeafsRequest) ([]byte, error) {
+func (NoopRequestHandler) HandleLeafsRequest(context.Context, ids.NodeID, uint32, LeafsRequest) ([]byte, error) {
 	return nil, nil
 }
 
-func (NoopRequestHandler) HandleBlockRequest(_ context.Context, _ ids.NodeID, _ uint32, _ BlockRequest) ([]byte, error) {
+func (NoopRequestHandler) HandleBlockRequest(context.Context, ids.NodeID, uint32, BlockRequest) ([]byte, error) {
 	return nil, nil
 }
 
-func (NoopRequestHandler) HandleCodeRequest(_ context.Context, _ ids.NodeID, _ uint32, _ CodeRequest) ([]byte, error) {
+func (NoopRequestHandler) HandleCodeRequest(context.Context, ids.NodeID, uint32, CodeRequest) ([]byte, error) {
 	return nil, nil
 }
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -1038,7 +1038,7 @@ func (vm *VM) GetBlockIDAtHeight(_ context.Context, height uint64) (ids.ID, erro
 	return ids.ID(hash), nil
 }
 
-func (*VM) Version(_ context.Context) (string, error) {
+func (*VM) Version(context.Context) (string, error) {
 	return Version, nil
 }
 
diff --git a/plugin/evm/vm_warp_test.go b/plugin/evm/vm_warp_test.go
@@ -340,7 +340,7 @@ func testWarpVMTransaction(t *testing.T, scheme string, unsignedMessage *avalanc
 
 	vm.ctx.ValidatorState = &validatorstest.State{
 		// TODO: test both Primary Network / C-Chain and non-Primary Network
-		GetSubnetIDF: func(_ context.Context, _ ids.ID) (ids.ID, error) {
+		GetSubnetIDF: func(context.Context, ids.ID) (ids.ID, error) {
 			return ids.Empty, nil
 		},
 		GetValidatorSetF: func(_ context.Context, height uint64, _ ids.ID) (map[ids.NodeID]*validators.GetValidatorOutput, error) {
@@ -639,7 +639,7 @@ func testReceiveWarpMessage(
 	getValidatorSetTestErr := errors.New("can't get validator set test error")
 
 	vm.ctx.ValidatorState = &validatorstest.State{
-		GetSubnetIDF: func(_ context.Context, _ ids.ID) (ids.ID, error) {
+		GetSubnetIDF: func(context.Context, ids.ID) (ids.ID, error) {
 			if msgFrom == fromPrimary {
 				return constants.PrimaryNetworkID, nil
 			}
@@ -888,7 +888,7 @@ func testSignatureRequestsToVM(t *testing.T, scheme string) {
 				return nil
 			}
 
-			tvm.AppSender.SendAppErrorF = func(_ context.Context, _ ids.NodeID, _ uint32, _ int32, _ string) error {
+			tvm.AppSender.SendAppErrorF = func(context.Context, ids.NodeID, uint32, int32, string) error {
 				calledSendAppErrorFn = true
 				require.ErrorIs(t, test.err, test.err)
 				return nil
diff --git a/plugin/evm/wrapped_block.go b/plugin/evm/wrapped_block.go
@@ -186,7 +186,7 @@ func (b *wrappedBlock) Timestamp() time.Time {
 }
 
 // Verify implements the snowman.Block interface
-func (b *wrappedBlock) Verify(_ context.Context) error {
+func (b *wrappedBlock) Verify(context.Context) error {
 	return b.verify(&precompileconfig.PredicateContext{
 		SnowCtx:            b.vm.ctx,
 		ProposerVMBlockCtx: nil,
diff --git a/precompile/contracts/warp/contract.go b/precompile/contracts/warp/contract.go
@@ -93,7 +93,9 @@ func PackGetBlockchainIDOutput(blockchainID common.Hash) ([]byte, error) {
 }
 
 // getBlockchainID returns the snow Chain Context ChainID of this blockchain.
-func getBlockchainID(accessibleState contract.AccessibleState, _ common.Address, _ common.Address, _ []byte, suppliedGas uint64, _ bool) (ret []byte, remainingGas uint64, err error) {
+//
+//nolint:revive
+func getBlockchainID(accessibleState contract.AccessibleState, caller common.Address, addr common.Address, input []byte, suppliedGas uint64, readOnly bool) (ret []byte, remainingGas uint64, err error) {
 	if remainingGas, err = contract.DeductGas(suppliedGas, GetBlockchainIDGasCost); err != nil {
 		return nil, 0, err
 	}
@@ -144,7 +146,8 @@ func UnpackGetVerifiedWarpBlockHashOutput(output []byte) (GetVerifiedWarpBlockHa
 	return outputStruct, err
 }
 
-func getVerifiedWarpBlockHash(accessibleState contract.AccessibleState, _ common.Address, _ common.Address, input []byte, suppliedGas uint64, _ bool) (ret []byte, remainingGas uint64, err error) {
+//nolint:revive
+func getVerifiedWarpBlockHash(accessibleState contract.AccessibleState, caller common.Address, addr common.Address, input []byte, suppliedGas uint64, readOnly bool) (ret []byte, remainingGas uint64, err error) {
 	return handleWarpMessage(accessibleState, input, suppliedGas, blockHashHandler{})
 }
 
@@ -188,7 +191,9 @@ func UnpackGetVerifiedWarpMessageOutput(output []byte) (GetVerifiedWarpMessageOu
 
 // getVerifiedWarpMessage retrieves the pre-verified warp message from the predicate storage slots and returns
 // the expected ABI encoding of the message to the caller.
-func getVerifiedWarpMessage(accessibleState contract.AccessibleState, _ common.Address, _ common.Address, input []byte, suppliedGas uint64, _ bool) (ret []byte, remainingGas uint64, err error) {
+//
+//nolint:revive
+func getVerifiedWarpMessage(accessibleState contract.AccessibleState, caller common.Address, addr common.Address, input []byte, suppliedGas uint64, readOnly bool) (ret []byte, remainingGas uint64, err error) {
 	return handleWarpMessage(accessibleState, input, suppliedGas, addressedPayloadHandler{})
 }
 
@@ -229,7 +234,9 @@ func UnpackSendWarpMessageOutput(output []byte) (common.Hash, error) {
 
 // sendWarpMessage constructs an Avalanche Warp Message containing an AddressedPayload and emits a log to signal validators that they should
 // be willing to sign this message.
-func sendWarpMessage(accessibleState contract.AccessibleState, caller common.Address, _ common.Address, input []byte, suppliedGas uint64, readOnly bool) (ret []byte, remainingGas uint64, err error) {
+//
+//nolint:revive
+func sendWarpMessage(accessibleState contract.AccessibleState, caller common.Address, addr common.Address, input []byte, suppliedGas uint64, readOnly bool) (ret []byte, remainingGas uint64, err error) {
 	if remainingGas, err = contract.DeductGas(suppliedGas, SendWarpMessageGasCost); err != nil {
 		return nil, 0, err
 	}
diff --git a/precompile/contracts/warp/contract_test.go b/precompile/contracts/warp/contract_test.go
diff --git a/precompile/contracts/warp/predicate_test.go b/precompile/contracts/warp/predicate_test.go
diff --git a/sync/statesync/code_syncer_test.go b/sync/statesync/code_syncer_test.go
diff --git a/sync/statesync/sync_test.go b/sync/statesync/sync_test.go
diff --git a/sync/vm/registry_test.go b/sync/vm/registry_test.go
diff --git a/triedb/firewood/account_trie.go b/triedb/firewood/account_trie.go
diff --git a/triedb/firewood/storage_trie.go b/triedb/firewood/storage_trie.go

Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,7 @@ func EmptyBlocksTest(t *testing.T, create createFunc) {`
`925`	`925`	`blockchain.DrainAcceptorQueue()`
`926`	`926`
`927`	`927`	`// Nothing to assert about the state`
`928`		`- checkState := func(_ *state.StateDB) error {`
	`928`	`+ checkState := func(*state.StateDB) error {`
`929`	`929`	`return nil`
`930`	`930`	`}`
`931`	`931`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ func (db *firewoodAccessorDb) OpenTrie(root common.Hash) (state.Trie, error) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// OpenStorageTrie opens a wrapped version of the account trie.`
`32`		`-func (*firewoodAccessorDb) OpenStorageTrie(_ common.Hash, _ common.Address, root common.Hash, self state.Trie) (state.Trie, error) {`
	`32`	`+func (*firewoodAccessorDb) OpenStorageTrie(_ common.Hash, _ common.Address, accountRoot common.Hash, self state.Trie) (state.Trie, error) {`
`33`	`33`	`accountTrie, ok := self.(*firewood.AccountTrie)`
`34`	`34`	`if !ok {`
`35`	`35`	`return nil, fmt.Errorf("Invalid account trie type: %T", self)`
`36`	`36`	`}`
`37`		`- return firewood.NewStorageTrie(accountTrie, root)`
	`37`	`+ return firewood.NewStorageTrie(accountTrie, accountRoot)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// CopyTrie returns a deep copy of the given trie.`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (f *BufferFIFOCache[K, V]) remove(key K) error {`
`65`	`65`
`66`	`66`	`type NoOpFIFOCache[K comparable, V any] struct{}`
`67`	`67`
`68`		`-func (*NoOpFIFOCache[K, V]) Put(_ K, _ V) {}`
`69`		`-func (*NoOpFIFOCache[K, V]) Get(_ K) (V, bool) {`
	`68`	`+func (*NoOpFIFOCache[K, V]) Put(K, V) {}`
	`69`	`+func (*NoOpFIFOCache[K, V]) Get(K) (V, bool) {`
`70`	`70`	`return *new(V), false`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (*MockTrieDB) Size() (common.StorageSize, common.StorageSize, common.Storag`
`34`	`34`	`return 0, 0, 0`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (*MockTrieDB) Cap(_ common.StorageSize) error {`
	`37`	`+func (*MockTrieDB) Cap(common.StorageSize) error {`
`38`	`38`	`return nil`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (api *DebugAPI) Preimage(ctx context.Context, hash common.Hash) (hexutil.By`
`102`	`102`	`// and returns them as a JSON list of block hashes.`
`103`	`103`	`func (api DebugAPI) GetBadBlocks(ctx context.Context) ([]ethapi.BadBlockArgs, error) {`
`104`	`104`	`internalAPI := ethapi.NewBlockChainAPI(api.eth.APIBackend)`
`105`		`- return internalAPI.GetBadBlocks()`
	`105`	`+ return internalAPI.GetBadBlocks(ctx)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// AccountRangeMaxResults is the maximum number of results to be returned per call`
Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,10 @@ func TestRequestAnyRequestsRoutingAndResponse(t *testing.T) {`
`134`	`134`	`func TestAppRequestOnCtxCancellation(t *testing.T) {`
`135`	`135`	`codecManager := buildCodec(t, HelloRequest{}, HelloResponse{})`
`136`	`136`	`sender := testAppSender{`
`137`		`- sendAppRequestFn: func(_ context.Context, _ set.Set[ids.NodeID], _ uint32, _ []byte) error {`
	`137`	`+ sendAppRequestFn: func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {`
`138`	`138`	`return nil`
`139`	`139`	`},`
`140`		`- sendAppResponseFn: func(_ ids.NodeID, _ uint32, _ []byte) error {`
	`140`	`+ sendAppResponseFn: func(ids.NodeID, uint32, []byte) error {`
`141`	`141`	`return nil`
`142`	`142`	`},`
`143`	`143`	`}`
`@@ -263,7 +263,7 @@ func TestAppRequestOnShutdown(t *testing.T) {`
`263`	`263`	`called bool`
`264`	`264`	`)`
`265`	`265`	`sender := testAppSender{`
`266`		`- sendAppRequestFn: func(_ context.Context, _ set.Set[ids.NodeID], _ uint32, _ []byte) error {`
	`266`	`+ sendAppRequestFn: func(context.Context, set.Set[ids.NodeID], uint32, []byte) error {`
`267`	`267`	`wg.Add(1)`
`268`	`268`	`go func() {`
`269`	`269`	`called = true`
`@@ -319,7 +319,7 @@ func TestSyncedAppRequestAnyOnCtxCancellation(t *testing.T) {`
`319`	`319`	`}`
`320`	`320`	`return nil`
`321`	`321`	`},`
`322`		`- sendAppResponseFn: func(_ ids.NodeID, _ uint32, _ []byte) error {`
	`322`	`+ sendAppResponseFn: func(ids.NodeID, uint32, []byte) error {`
`323`	`323`	`return nil`
`324`	`324`	`},`
`325`	`325`	`}`
`@@ -639,7 +639,7 @@ func (t testAppSender) SendAppGossip(_ context.Context, config common.SendConfig`
`639`	`639`	`return t.sendAppGossipFn(config, message)`
`640`	`640`	`}`
`641`	`641`
`642`		`-func (testAppSender) SendAppError(_ context.Context, _ ids.NodeID, _ uint32, _ int32, _ string) error {`
	`642`	`+func (testAppSender) SendAppError(context.Context, ids.NodeID, uint32, int32, string) error {`
`643`	`643`	`panic("not implemented")`
`644`	`644`	`}`
`645`	`645`
`@@ -751,12 +751,12 @@ type testSDKHandler struct {`
`751`	`751`	`appRequested bool`
`752`	`752`	`}`
`753`	`753`
`754`		`-func (*testSDKHandler) AppGossip(_ context.Context, _ ids.NodeID, _ []byte) {`
	`754`	`+func (*testSDKHandler) AppGossip(context.Context, ids.NodeID, []byte) {`
`755`	`755`	`// TODO implement me`
`756`	`756`	`panic("implement me")`
`757`	`757`	`}`
`758`	`758`
`759`		`-func (t testSDKHandler) AppRequest(_ context.Context, _ ids.NodeID, _ time.Time, _ []byte) ([]byte, common.AppError) {`
	`759`	`+func (t testSDKHandler) AppRequest(context.Context, ids.NodeID, time.Time, []byte) ([]byte, common.AppError) {`
`760`	`760`	`t.appRequested = true`
`761`	`761`	`return nil, nil`
`762`	`762`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ type ChainConfig struct {`
`110`	`110`	UpgradeConfig `json:"-"` // Config specified in upgradeBytes (avalanche network upgrades or enable/disabling precompiles). Not serialized.
`111`	`111`	`}`
`112`	`112`
`113`		`-func (c ChainConfig) CheckConfigCompatible(newcfg_ ethparams.ChainConfig, _ big.Int, headTimestamp uint64) ethparams.ConfigCompatError {`
	`113`	`+//nolint:revive`
	`114`	`+func (c ChainConfig) CheckConfigCompatible(newcfg_ ethparams.ChainConfig, headNumber big.Int, headTimestamp uint64) ethparams.ConfigCompatError {`
`114`	`115`	`if c == nil {`
`115`	`116`	`return nil`
`116`	`117`	`}`