From ca0813a7b7ffb3faa6a4c47b9e7dfe1ee2ceb47c Mon Sep 17 00:00:00 2001 From: maskpp Date: Fri, 28 Jun 2024 20:46:15 +0800 Subject: [PATCH] avoid use map point --- ethclient/gethclient/gethclient.go | 4 ++-- ethclient/gethclient/gethclient_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ethclient/gethclient/gethclient.go b/ethclient/gethclient/gethclient.go index b1678b6766..ab0059e88d 100644 --- a/ethclient/gethclient/gethclient.go +++ b/ethclient/gethclient/gethclient.go @@ -135,7 +135,7 @@ func (ec *Client) GetProof(ctx context.Context, account common.Address, keys []s // overrides specifies a map of contract states that should be overwritten before executing // the message call. // Please use ethclient.CallContract instead if you don't need the override functionality. -func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int, overrides *map[common.Address]OverrideAccount) ([]byte, error) { +func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int, overrides map[common.Address]OverrideAccount) ([]byte, error) { var hex hexutil.Bytes err := ec.c.CallContext( ctx, &hex, "eth_call", toCallArg(msg), @@ -157,7 +157,7 @@ func (ec *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockN // blockOverrides specifies block fields exposed to the EVM that can be overridden for the call. // // Please use ethclient.CallContract instead if you don't need the override functionality. -func (ec *Client) CallContractWithBlockOverrides(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int, overrides *map[common.Address]OverrideAccount, blockOverrides BlockOverrides) ([]byte, error) { +func (ec *Client) CallContractWithBlockOverrides(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int, overrides map[common.Address]OverrideAccount, blockOverrides BlockOverrides) ([]byte, error) { var hex hexutil.Bytes err := ec.c.CallContext( ctx, &hex, "eth_call", toCallArg(msg), diff --git a/ethclient/gethclient/gethclient_test.go b/ethclient/gethclient/gethclient_test.go index 59ad370146..32de74e3e7 100644 --- a/ethclient/gethclient/gethclient_test.go +++ b/ethclient/gethclient/gethclient_test.go @@ -442,7 +442,7 @@ func testCallContract(t *testing.T, client *rpc.Client) { } mapAcc := make(map[common.Address]OverrideAccount) mapAcc[testAddr] = override - if _, err := ec.CallContract(context.Background(), msg, big.NewInt(0), &mapAcc); err != nil { + if _, err := ec.CallContract(context.Background(), msg, big.NewInt(0), mapAcc); err != nil { t.Fatalf("unexpected error: %v", err) } } @@ -548,7 +548,7 @@ func testCallContractWithBlockOverrides(t *testing.T, client *rpc.Client) { } mapAcc := make(map[common.Address]OverrideAccount) mapAcc[common.Address{}] = override - res, err := ec.CallContract(context.Background(), msg, big.NewInt(0), &mapAcc) + res, err := ec.CallContract(context.Background(), msg, big.NewInt(0), mapAcc) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -560,7 +560,7 @@ func testCallContractWithBlockOverrides(t *testing.T, client *rpc.Client) { bo := BlockOverrides{ Coinbase: common.HexToAddress("0x1111111111111111111111111111111111111111"), } - res, err = ec.CallContractWithBlockOverrides(context.Background(), msg, big.NewInt(0), &mapAcc, bo) + res, err = ec.CallContractWithBlockOverrides(context.Background(), msg, big.NewInt(0), mapAcc, bo) if err != nil { t.Fatalf("unexpected error: %v", err) }