style: revive fix based on feedback (#1187)

Signed-off-by: Austin Larson <78000745+alarso16@users.noreply.github.com>
Co-authored-by: Arran Schlosberg <519948+ARR4N@users.noreply.github.com>

Author: alarso16

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
 	}
 

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.

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
 }

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
 }
 

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

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))

internal/ethapi/api_extra_test.go

@@ -4,18 +4,87 @@
 package ethapi
 
 import (
+	"context"
 	"errors"
 	"math/big"
 	"testing"
 
 	"github.com/ava-labs/libevm/common"
+	"github.com/ava-labs/libevm/common/hexutil"
 	"github.com/ava-labs/libevm/core/types"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
+	"github.com/ava-labs/coreth/consensus/dummy"
+	"github.com/ava-labs/coreth/core"
+	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/rpc"
+
+	ethparams "github.com/ava-labs/libevm/params"
 )
 
+func TestBlockchainAPI_GetChainConfig(t *testing.T) {
+	t.Parallel()
+
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	wantConfig := &params.ChainConfig{
+		ChainID: big.NewInt(43114),
+	}
+	backend := NewMockBackend(ctrl)
+	backend.EXPECT().ChainConfig().Return(wantConfig)
+
+	api := NewBlockChainAPI(backend)
+
+	gotConfig := api.GetChainConfig(context.Background())
+	assert.Equal(t, wantConfig, gotConfig)
+}
+
+// Copy one test case from TestCall
+func TestBlockchainAPI_CallDetailed(t *testing.T) {
+	t.Parallel()
+	// Initialize test accounts
+	var (
+		accounts = newAccounts(2)
+		genesis  = &core.Genesis{
+			Config: params.TestChainConfig,
+			Alloc: types.GenesisAlloc{
+				accounts[0].addr: {Balance: big.NewInt(params.Ether)},
+				accounts[1].addr: {Balance: big.NewInt(params.Ether)},
+			},
+		}
+		genBlocks   = 10
+		signer      = types.HomesteadSigner{}
+		blockNumber = rpc.LatestBlockNumber
+	)
+	api := NewBlockChainAPI(newTestBackend(t, genBlocks, genesis, dummy.NewCoinbaseFaker(), func(i int, b *core.BlockGen) {
+		// Transfer from account[0] to account[1]
+		//    value: 1000 wei
+		//    fee:   0 wei
+		tx, _ := types.SignTx(types.NewTx(&types.LegacyTx{Nonce: uint64(i), To: &accounts[1].addr, Value: big.NewInt(1000), Gas: ethparams.TxGas, GasPrice: b.BaseFee(), Data: nil}), signer, accounts[0].key)
+		b.AddTx(tx)
+	}))
+
+	result, err := api.CallDetailed(
+		context.Background(),
+		TransactionArgs{
+			From:  &accounts[0].addr,
+			To:    &accounts[1].addr,
+			Value: (*hexutil.Big)(big.NewInt(1000)),
+		},
+		rpc.BlockNumberOrHash{BlockNumber: &blockNumber},
+		nil,
+	)
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Equal(t, 0, result.ErrCode)
+	require.Nil(t, result.ReturnData)
+	require.Equal(t, ethparams.TxGas, result.UsedGas)
+	require.Empty(t, result.Err)
+}
+
 func TestBlockChainAPI_stateQueryBlockNumberAllowed(t *testing.T) {
 	t.Parallel()
 

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
 }

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 // General-purpose types lose the meaning of args if unused ones are removed
+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

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 // General-purpose types lose the meaning of args if unused ones are removed
+func (c *ChainConfig) CheckConfigCompatible(newcfg_ *ethparams.ChainConfig, headNumber *big.Int, headTimestamp uint64) *ethparams.ConfigCompatError {
 	if c == nil {
 		return nil
 	}