Skip to content

refactor: use errors.New to replace fmt.Errorf with no parameters #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LesCyber wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: use errors.New to replace fmt.Errorf with no parameters #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions evm/pending_state/pending_ctx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package pending_state

import (
"errors"
"fmt"
"sync"

"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -144,7 +143,7 @@ func (sctx *StateContext) SelfDestruct(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.WriteConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Write.VisitDestruct(addr, txnID)
return nil
Expand All @@ -158,7 +157,7 @@ func (sctx *StateContext) WriteAccount(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.WriteConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Write.VisitAccount(addr, txnID)
return nil
Expand All @@ -172,7 +171,7 @@ func (sctx *StateContext) WriteBalance(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.WriteConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Write.VisitBalance(addr, txnID)
return nil
Expand All @@ -186,7 +185,7 @@ func (sctx *StateContext) ReadBalance(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.ReadConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Read.VisitBalance(addr, txnID)
return nil
Expand All @@ -200,7 +199,7 @@ func (sctx *StateContext) WriteCode(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.WriteConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Write.VisitCode(addr, txnID)
return nil
Expand All @@ -214,7 +213,7 @@ func (sctx *StateContext) ReadCode(addr common.Address, txnID int64) error {
}
if sctx.needCheck && sctx.ReadConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Read.VisitCode(addr, txnID)
return nil
Expand All @@ -228,7 +227,7 @@ func (sctx *StateContext) WriteState(addr common.Address, key common.Hash, txnID
}
if sctx.needCheck && sctx.WriteConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Write.VisitState(addr, key, txnID)
return nil
Expand All @@ -242,7 +241,7 @@ func (sctx *StateContext) ReadState(addr common.Address, key common.Hash, txnID
}
if sctx.needCheck && sctx.ReadConflict(addr, txnID) {
sctx.meetConflict = true
return fmt.Errorf("conflict")
return errors.New("conflict")
}
sctx.Read.VisitState(addr, key, txnID)
return nil
Expand Down
2 changes: 1 addition & 1 deletion test/uniswap/uniswapTPS_testcase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (cd *UniswapV2TPSStatisticsTestCase) prepareDeployerContract(deployerUser *
return [20]byte{}, nil, fmt.Errorf("Failed to confirm approve transaction: %v", err)
}
if !isConfirmed {
return [20]byte{}, nil, fmt.Errorf("transaction was not confirmed")
return [20]byte{}, nil, errors.New("transaction was not confirmed")
}
logrus.Info("deploy contracts done")
err = dispatchTestToken(client, depolyerAuth, ERC20DeployedContracts, testUsers, big.NewInt(accountInitialERC20Token))
Expand Down
2 changes: 1 addition & 1 deletion test/uniswap/uniswapV2Accuracy_testcase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func (ca *UniswapV2AccuracyTestCase) prepareDeployerContract(deployerUser *pkg.E
return [20]byte{}, nil, fmt.Errorf("Failed to confirm approve transaction: %v", err)
}
if !isConfirmed {
return [20]byte{}, nil, fmt.Errorf("transaction was not confirmed")
return [20]byte{}, nil, errors.New("transaction was not confirmed")
}
err = dispatchTestToken(client, depolyerAuth, ERC20DeployedContracts, testUsers, big.NewInt(accountInitialERC20Token))
if err != nil {
Expand Down