rm callConfig object

ethereum · Apr 4, 2023 · 7d55a4d · 7d55a4d
1 parent e3f3129
commit 7d55a4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -984,7 +984,7 @@ func (context *ChainContext) GetHeader(hash common.Hash, number uint64) *types.H
 	return header
 }
 
-func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride, config *callConfig, timeout time.Duration, globalGasCap uint64) (*core.ExecutionResult, error) {
+func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride, blockOverrides *BlockOverrides, timeout time.Duration, globalGasCap uint64) (*core.ExecutionResult, error) {
 	defer func(start time.Time) { log.Debug("Executing EVM call finished", "runtime", time.Since(start)) }(time.Now())
 
 	state, header, err := b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
@@ -1012,8 +1012,8 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
 		return nil, err
 	}
 	blockCtx := core.NewEVMBlockContext(header, NewChainContext(ctx, b), nil)
-	if config != nil && config.BlockOverrides != nil {
-		config.BlockOverrides.Apply(&blockCtx)
+	if blockOverrides != nil {
+		blockOverrides.Apply(&blockCtx)
 	}
 	evm, vmError, err := b.GetEVM(ctx, msg, state, header, &vm.Config{NoBaseFee: true}, &blockCtx)
 	if err != nil {
@@ -1083,8 +1083,8 @@ type callConfig struct {
 //
 // Note, this function doesn't make and changes in the state/blockchain and is
 // useful to execute and retrieve values.
-func (s *BlockChainAPI) Call(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride, config *callConfig) (hexutil.Bytes, error) {
-	result, err := DoCall(ctx, s.b, args, blockNrOrHash, overrides, config, s.b.RPCEVMTimeout(), s.b.RPCGasCap())
+func (s *BlockChainAPI) Call(ctx context.Context, args TransactionArgs, blockNrOrHash rpc.BlockNumberOrHash, overrides *StateOverride, blockOverrides *BlockOverrides) (hexutil.Bytes, error) {
+	result, err := DoCall(ctx, s.b, args, blockNrOrHash, overrides, blockOverrides, s.b.RPCEVMTimeout(), s.b.RPCGasCap())
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go
@@ -314,12 +314,12 @@ func TestCall(t *testing.T) {
 	}))
 	randomAccounts := newAccounts(3)
 	var testSuite = []struct {
-		blockNumber rpc.BlockNumber
-		overrides   StateOverride
-		call        TransactionArgs
-		config      *callConfig
-		expectErr   error
-		want        string
+		blockNumber    rpc.BlockNumber
+		overrides      StateOverride
+		call           TransactionArgs
+		blockOverrides BlockOverrides
+		expectErr      error
+		want           string
 	}{
 		// transfer on genesis
 		{
@@ -429,14 +429,12 @@ func TestCall(t *testing.T) {
 					0x60, 0x20, 0x60, 0x00, 0xf3,
 				},
 			},
-			config: &callConfig{
-				BlockOverrides: &BlockOverrides{Number: (*hexutil.Big)(big.NewInt(11))},
-			},
-			want: "0x000000000000000000000000000000000000000000000000000000000000000b",
+			blockOverrides: BlockOverrides{Number: (*hexutil.Big)(big.NewInt(11))},
+			want:           "0x000000000000000000000000000000000000000000000000000000000000000b",
 		},
 	}
 	for i, tc := range testSuite {
-		result, err := api.Call(context.Background(), tc.call, rpc.BlockNumberOrHash{BlockNumber: &tc.blockNumber}, &tc.overrides, tc.config)
+		result, err := api.Call(context.Background(), tc.call, rpc.BlockNumberOrHash{BlockNumber: &tc.blockNumber}, &tc.overrides, &tc.blockOverrides)
 		if tc.expectErr != nil {
 			if err == nil {
 				t.Errorf("test %d: want error %v, have nothing", i, tc.expectErr)