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

all: replace t.Log(); t.FailNow() with t.Fatal() (#19849)

Browse source
This commit is contained in:
Daniel Liu 2025-01-14 10:56:09 +08:00
parent f571689bab
commit 6d17a42edb
5 changed files with 26 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
accounts/abi/abi_test.go
View file

@ -21,7 +21,6 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
"log"
"math/big" "math/big"
"reflect" "reflect"
"strings" "strings"
@ -105,8 +104,7 @@ func TestReader(t *testing.T) {
func TestTestNumbers(t *testing.T) { func TestTestNumbers(t *testing.T) {
abi, err := JSON(strings.NewReader(jsondata2)) abi, err := JSON(strings.NewReader(jsondata2))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if _, err := abi.Pack("balance"); err != nil { if _, err := abi.Pack("balance"); err != nil {
@ -143,8 +141,7 @@ func TestTestNumbers(t *testing.T) {
func TestTestString(t *testing.T) { func TestTestString(t *testing.T) {
abi, err := JSON(strings.NewReader(jsondata2)) abi, err := JSON(strings.NewReader(jsondata2))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if _, err := abi.Pack("string", "hello world"); err != nil { if _, err := abi.Pack("string", "hello world"); err != nil {
@ -155,8 +152,7 @@ func TestTestString(t *testing.T) {
func TestTestBool(t *testing.T) { func TestTestBool(t *testing.T) {
abi, err := JSON(strings.NewReader(jsondata2)) abi, err := JSON(strings.NewReader(jsondata2))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if _, err := abi.Pack("bool", true); err != nil { if _, err := abi.Pack("bool", true); err != nil {
@ -167,8 +163,7 @@ func TestTestBool(t *testing.T) {
func TestTestSlice(t *testing.T) { func TestTestSlice(t *testing.T) {
abi, err := JSON(strings.NewReader(jsondata2)) abi, err := JSON(strings.NewReader(jsondata2))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
slice := make([]uint64, 2) slice := make([]uint64, 2)
@ -224,8 +219,7 @@ func TestMethodSignature(t *testing.T) {
func TestMultiPack(t *testing.T) { func TestMultiPack(t *testing.T) {
abi, err := JSON(strings.NewReader(jsondata2)) abi, err := JSON(strings.NewReader(jsondata2))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
sig := crypto.Keccak256([]byte("bar(uint32,uint16)"))[:4] sig := crypto.Keccak256([]byte("bar(uint32,uint16)"))[:4]
@ -235,8 +229,7 @@ func TestMultiPack(t *testing.T) {
packed, err := abi.Pack("bar", uint32(10), uint16(11)) packed, err := abi.Pack("bar", uint32(10), uint16(11))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if !bytes.Equal(packed, sig) { if !bytes.Equal(packed, sig) {
@ -249,11 +242,11 @@ func ExampleJSON() {
abi, err := JSON(strings.NewReader(definition)) abi, err := JSON(strings.NewReader(definition))
if err != nil { if err != nil {
log.Fatalln(err) panic(err)
} }
out, err := abi.Pack("isBar", common.HexToAddress("01")) out, err := abi.Pack("isBar", common.HexToAddress("01"))
if err != nil { if err != nil {
log.Fatalln(err) panic(err)
} }
fmt.Printf("%x\n", out) fmt.Printf("%x\n", out)

13
consensus/tests/engine_v2_tests/forensics_test.go
View file

@ -3,6 +3,7 @@ package engine_v2_tests
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding/json" "encoding/json"
"errors"
"math/big" "math/big"
"testing" "testing"
"time" "time"
@ -16,6 +17,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
var errTimeoutAfter5Seconds = errors.New("timeout after 5 seconds")
func TestProcessQcShallSetForensicsCommittedQc(t *testing.T) { func TestProcessQcShallSetForensicsCommittedQc(t *testing.T) {
t.Skip("Skipping this test for now as we disable forensics") t.Skip("Skipping this test for now as we disable forensics")
@ -200,7 +203,7 @@ func TestForensicsMonitoringNotOnSameChainButHaveSameRoundQC(t *testing.T) {
assert.Equal(t, 5, len(content.LargerRoundInfo.SignerAddresses)) assert.Equal(t, 5, len(content.LargerRoundInfo.SignerAddresses))
return return
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.FailNow() t.Fatal(errTimeoutAfter5Seconds)
} }
} }
} }
@ -262,7 +265,7 @@ func TestForensicsMonitoringNotOnSameChainDoNotHaveSameRoundQC(t *testing.T) {
assert.Equal(t, 2, len(content.LargerRoundInfo.SignerAddresses)) assert.Equal(t, 2, len(content.LargerRoundInfo.SignerAddresses))
return return
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.FailNow() t.Fatal(errTimeoutAfter5Seconds)
} }
} }
} }
@ -327,7 +330,7 @@ func TestForensicsAcrossEpoch(t *testing.T) {
assert.Equal(t, 2, len(content.LargerRoundInfo.SignerAddresses)) assert.Equal(t, 2, len(content.LargerRoundInfo.SignerAddresses))
return return
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.FailNow() t.Fatal(errTimeoutAfter5Seconds)
} }
} }
} }
@ -395,7 +398,7 @@ func TestVoteEquivocationSameRound(t *testing.T) {
assert.Equal(t, types.Round(5), content.LargerRoundVote.ProposedBlockInfo.Round) assert.Equal(t, types.Round(5), content.LargerRoundVote.ProposedBlockInfo.Round)
return return
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.FailNow() t.Fatal(errTimeoutAfter5Seconds)
} }
} }
} }
@ -452,7 +455,7 @@ func TestVoteEquivocationDifferentRound(t *testing.T) {
assert.Equal(t, acc1Addr, content.Signer) assert.Equal(t, acc1Addr, content.Signer)
return return
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.FailNow() t.Fatal(errTimeoutAfter5Seconds)
} }
} }
} }

3
core/blockchain_test.go
View file

@ -157,8 +157,7 @@ func testHeaderChainImport(chain []*types.Header, blockchain *BlockChain) error
func insertChain(done chan bool, blockchain *BlockChain, chain types.Blocks, t *testing.T) { func insertChain(done chan bool, blockchain *BlockChain, chain types.Blocks, t *testing.T) {
_, err := blockchain.InsertChain(chain) _, err := blockchain.InsertChain(chain)
if err != nil { if err != nil {
fmt.Println(err) t.Fatal(err)
t.FailNow()
} }
done <- true done <- true
} }

12
core/txpool/lending_pool_test.go
View file

@ -177,8 +177,7 @@ func TestSendLending(t *testing.T) {
} }
nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey)) nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey))
if err != nil { if err != nil {
t.Error("fail to get nonce") t.Fatal("fail to get nonce")
t.FailNow()
} }
for { for {
@ -249,8 +248,7 @@ func TestCancelLending(t *testing.T) {
} }
nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey)) nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey))
if err != nil { if err != nil {
t.Error("fail to get nonce") t.Fatal("fail to get nonce")
t.FailNow()
} }
// 10% // 10%
@ -272,16 +270,14 @@ func TestRecallLending(t *testing.T) {
} }
nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey)) nonce, err := getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey))
if err != nil { if err != nil {
t.Error("fail to get nonce") t.Fatal("fail to get nonce")
t.FailNow()
} }
interestRate := 10 * common.BaseLendingInterest.Uint64() interestRate := 10 * common.BaseLendingInterest.Uint64()
testSendLending(key, nonce, USDAddress, common.Address{}, new(big.Int).Mul(_1E8, big.NewInt(1000)), interestRate, lendingstate.Investing, lendingstate.LendingStatusNew, true, 0, 0, common.Hash{}, "") testSendLending(key, nonce, USDAddress, common.Address{}, new(big.Int).Mul(_1E8, big.NewInt(1000)), interestRate, lendingstate.Investing, lendingstate.LendingStatusNew, true, 0, 0, common.Hash{}, "")
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
nonce, err = getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey)) nonce, err = getLendingNonce(crypto.PubkeyToAddress(privateKey.PublicKey))
if err != nil { if err != nil {
t.Error("fail to get nonce") t.Fatal("fail to get nonce")
t.FailNow()
} }
testSendLending(key, nonce, USDAddress, common.XDCNativeAddressBinary, new(big.Int).Mul(_1E8, big.NewInt(1000)), interestRate, lendingstate.Borrowing, lendingstate.LendingStatusNew, true, 0, 0, common.Hash{}, "") testSendLending(key, nonce, USDAddress, common.XDCNativeAddressBinary, new(big.Int).Mul(_1E8, big.NewInt(1000)), interestRate, lendingstate.Borrowing, lendingstate.LendingStatusNew, true, 0, 0, common.Hash{}, "")
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)

14
core/types/transaction_test.go
View file

@ -230,14 +230,12 @@ func TestRecipientEmpty(t *testing.T) {
_, addr := defaultTestKey() _, addr := defaultTestKey()
tx, err := decodeTx(common.Hex2Bytes("f8498080808080011ca09b16de9d5bdee2cf56c28d16275a4da68cd30273e2525f3959f5d62557489921a0372ebd8fb3345f7db7b5a86d42e24d36e983e259b0664ceb8c227ec9af572f3d")) tx, err := decodeTx(common.Hex2Bytes("f8498080808080011ca09b16de9d5bdee2cf56c28d16275a4da68cd30273e2525f3959f5d62557489921a0372ebd8fb3345f7db7b5a86d42e24d36e983e259b0664ceb8c227ec9af572f3d"))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
from, err := Sender(HomesteadSigner{}, tx) from, err := Sender(HomesteadSigner{}, tx)
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if addr != from { if addr != from {
t.Error("derived address doesn't match") t.Error("derived address doesn't match")
@ -249,18 +247,16 @@ func TestRecipientNormal(t *testing.T) {
tx, err := decodeTx(common.Hex2Bytes("f85d80808094000000000000000000000000000000000000000080011ca0527c0d8f5c63f7b9f41324a7c8a563ee1190bcbf0dac8ab446291bdbf32f5c79a0552c4ef0a09a04395074dab9ed34d3fbfb843c2f2546cc30fe89ec143ca94ca6")) tx, err := decodeTx(common.Hex2Bytes("f85d80808094000000000000000000000000000000000000000080011ca0527c0d8f5c63f7b9f41324a7c8a563ee1190bcbf0dac8ab446291bdbf32f5c79a0552c4ef0a09a04395074dab9ed34d3fbfb843c2f2546cc30fe89ec143ca94ca6"))
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
from, err := Sender(HomesteadSigner{}, tx) from, err := Sender(HomesteadSigner{}, tx)
if err != nil { if err != nil {
t.Error(err) t.Fatal(err)
t.FailNow()
} }
if addr != from { if addr != from {
t.Error("derived address doesn't match") t.Fatal("derived address doesn't match")
} }
} }