diff --git a/contracts/trc21issuer/trc21issuer_test.go b/contracts/trc21issuer/trc21issuer_test.go index 698aa3f97d4a..a8658b105be3 100644 --- a/contracts/trc21issuer/trc21issuer_test.go +++ b/contracts/trc21issuer/trc21issuer_test.go @@ -1,6 +1,7 @@ package trc21issuer import ( + "context" "math/big" "testing" @@ -60,7 +61,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) { contractBackend.Commit() //check trc21 SMC balance - balance, err := contractBackend.BalanceAt(nil, trc21IssuerAddr, nil) + balance, err := contractBackend.BalanceAt(context.TODO(), trc21IssuerAddr, nil) if err != nil || balance.Cmp(minApply) != 0 { t.Fatal("can't get balance in trc21Issuer SMC: ", err, "got", balance, "wanted", minApply) } @@ -78,7 +79,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) { t.Fatal("can't execute transfer in tr20: ", err) } contractBackend.Commit() - receipt, err := contractBackend.TransactionReceipt(nil, tx.Hash()) + receipt, err := contractBackend.TransactionReceipt(context.TODO(), tx.Hash()) if err != nil { t.Fatal("can't transaction's receipt ", err, "hash", tx.Hash()) } @@ -100,7 +101,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) { t.Fatal("check balance token fee in smart contract: got", balanceIssuerFee, "wanted", remainFee) } //check trc21 SMC balance - balance, err = contractBackend.BalanceAt(nil, trc21IssuerAddr, nil) + balance, err = contractBackend.BalanceAt(context.TODO(), trc21IssuerAddr, nil) if err != nil || balance.Cmp(remainFee) != 0 { t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee) } @@ -130,7 +131,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) { t.Fatal("check balance after fail transfer in tr20: ", err, "get", balance, "wanted", remainAirDrop) } - receipt, err = contractBackend.TransactionReceipt(nil, tx.Hash()) + receipt, err = contractBackend.TransactionReceipt(context.TODO(), tx.Hash()) if err != nil { t.Fatal("can't transaction's receipt ", err, "hash", tx.Hash()) } @@ -142,7 +143,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) { t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee) } //check trc21 SMC balance - balance, err = contractBackend.BalanceAt(nil, trc21IssuerAddr, nil) + balance, err = contractBackend.BalanceAt(context.TODO(), trc21IssuerAddr, nil) if err != nil || balance.Cmp(remainFee) != 0 { t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee) } diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 552043007c80..505e5921d62e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -3442,14 +3442,14 @@ func GetSignersFromBlocks(b Backend, blockNumber uint64, blockHash common.Hash, limitNumber = currentNumber } for i := blockNumber + 1; i <= limitNumber; i++ { - header, err := b.HeaderByNumber(nil, rpc.BlockNumber(i)) + header, err := b.HeaderByNumber(context.TODO(), rpc.BlockNumber(i)) if err != nil { return addrs, err } if header == nil { return addrs, errors.New("nil header in GetSignersFromBlocks") } - blockData, err := b.BlockByNumber(nil, rpc.BlockNumber(i)) + blockData, err := b.BlockByNumber(context.TODO(), rpc.BlockNumber(i)) if err != nil { return addrs, err }