forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-15 09:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #695 from gzliudan/fix-sa1012

Browse source 
fix staticcheck warning SA1012: pass nil Context to function
This commit is contained in:
Daniel Liu 2024-10-25 19:34:09 +08:00 committed by GitHub
commit acb973ab97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contracts/trc21issuer/trc21issuer_test.go
View file

@ -1,6 +1,7 @@
package trc21issuer package trc21issuer
import ( import (
"context"
"math/big" "math/big"
"testing" "testing"
@ -60,7 +61,7 @@ func TestFeeTxWithTRC21Token(t *testing.T) {
contractBackend.Commit() contractBackend.Commit()
//check trc21 SMC balance //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 { if err != nil || balance.Cmp(minApply) != 0 {
t.Fatal("can't get balance in trc21Issuer SMC: ", err, "got", balance, "wanted", minApply) 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) t.Fatal("can't execute transfer in tr20: ", err)
} }
contractBackend.Commit() contractBackend.Commit()
receipt, err := contractBackend.TransactionReceipt(nil, tx.Hash()) receipt, err := contractBackend.TransactionReceipt(context.TODO(), tx.Hash())
if err != nil { if err != nil {
t.Fatal("can't transaction's receipt ", err, "hash", tx.Hash()) 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) t.Fatal("check balance token fee in smart contract: got", balanceIssuerFee, "wanted", remainFee)
} }
//check trc21 SMC balance //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 { if err != nil || balance.Cmp(remainFee) != 0 {
t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee) 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) 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 { if err != nil {
t.Fatal("can't transaction's receipt ", err, "hash", tx.Hash()) 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) t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee)
} }
//check trc21 SMC balance //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 { if err != nil || balance.Cmp(remainFee) != 0 {
t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee) t.Fatal("can't get balance token fee in smart contract: ", err, "got", balanceIssuerFee, "wanted", remainFee)
} }

4
internal/ethapi/api.go
View file

@ -3442,14 +3442,14 @@ func GetSignersFromBlocks(b Backend, blockNumber uint64, blockHash common.Hash,
limitNumber = currentNumber limitNumber = currentNumber
} }
for i := blockNumber + 1; i <= limitNumber; i++ { 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 { if err != nil {
return addrs, err return addrs, err
} }
if header == nil { if header == nil {
return addrs, errors.New("nil header in GetSignersFromBlocks") 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 { if err != nil {
return addrs, err return addrs, err
} }