Merge pull request #557 from JukLee0ira/reps-fmtErrorf

WIP: use errrors.New instead of empty fmt.Errorf (ethereum#27329)

XDCxlending/lendingstate/lendingcontract.go

@@ -1,7 +1,7 @@
 package lendingstate
 
 import (
- "fmt"
+ "errors"
  "math/big"
 
  "github.com/XinFinOrg/XDPoSChain/XDCx/tradingstate"
@@ -273,10 +273,10 @@ func GetAllLendingBooks(statedb *state.StateDB) (mapLendingBook map[common.Hash]
  baseTokens := GetSupportedBaseToken(statedb)
  terms := GetSupportedTerms(statedb)
  if len(baseTokens) == 0 {
- return nil, fmt.Errorf("GetAllLendingBooks: empty baseToken list")
+ return nil, errors.New("GetAllLendingBooks: empty baseToken list")
  }
  if len(terms) == 0 {
- return nil, fmt.Errorf("GetAllLendingPairs: empty term list")
+ return nil, errors.New("GetAllLendingPairs: empty term list")
  }
  for _, baseToken := range baseTokens {
  for _, term := range terms {
@@ -295,10 +295,10 @@ func GetAllLendingPairs(statedb *state.StateDB) (allPairs []LendingPair, err err
  baseTokens := GetSupportedBaseToken(statedb)
  collaterals := GetAllCollateral(statedb)
  if len(baseTokens) == 0 {
- return allPairs, fmt.Errorf("GetAllLendingPairs: empty baseToken list")
+ return allPairs, errors.New("GetAllLendingPairs: empty baseToken list")
  }
  if len(collaterals) == 0 {
- return allPairs, fmt.Errorf("GetAllLendingPairs: empty collateral list")
+ return allPairs, errors.New("GetAllLendingPairs: empty collateral list")
  }
  for _, baseToken := range baseTokens {
  for _, collateral := range collaterals {

XDCxlending/lendingstate/lendingitem.go

@@ -1,6 +1,7 @@
 package lendingstate
 
 import (
+ "errors"
  "fmt"
  "math/big"
  "strconv"
@@ -359,7 +360,7 @@ func (l *LendingItem) VerifyLendingSignature() error {
  tx.ImportSignature(V, R, S)
  from, _ := types.LendingSender(types.LendingTxSigner{}, tx)
  if from != tx.UserAddress() {
- return fmt.Errorf("verify lending item: invalid signature")
+ return errors.New("verify lending item: invalid signature")
  }
  return nil
 }
@@ -473,10 +474,10 @@ func VerifyBalance(isXDCXLendingFork bool, statedb *state.StateDB, lendingStateD
  }
  return nil
  default:
- return fmt.Errorf("VerifyBalance: unknown lending side")
+ return errors.New("VerifyBalance: unknown lending side")
  }
  default:
- return fmt.Errorf("VerifyBalance: unknown lending type")
+ return errors.New("VerifyBalance: unknown lending type")
  }
  return nil
 }

XDCxlending/order_processor.go

@@ -2,6 +2,7 @@ package XDCxlending
 
 import (
  "encoding/json"
+ "errors"
  "fmt"
  "math/big"
 
@@ -264,7 +265,7 @@ func (l *Lending) processOrderList(header *types.Header, coinbase common.Address
  borrowFee = lendingstate.GetFee(statedb, oldestOrder.Relayer)
  }
  if collateralToken.IsZero() {
- return nil, nil, nil, fmt.Errorf("empty collateral")
+ return nil, nil, nil, errors.New("empty collateral")
  }
  depositRate, liquidationRate, recallRate := lendingstate.GetCollateralDetail(statedb, collateralToken)
  if depositRate == nil || depositRate.Sign() <= 0 {
@@ -282,10 +283,10 @@ func (l *Lending) processOrderList(header *types.Header, coinbase common.Address
  return nil, nil, nil, err
  }
  if lendTokenXDCPrice == nil || lendTokenXDCPrice.Sign() <= 0 {
- return nil, nil, nil, fmt.Errorf("invalid lendToken price")
+ return nil, nil, nil, errors.New("invalid lendToken price")
  }
  if collateralPrice == nil || collateralPrice.Sign() <= 0 {
- return nil, nil, nil, fmt.Errorf("invalid collateral price")
+ return nil, nil, nil, errors.New("invalid collateral price")
  }
  tradedQuantity, collateralLockedAmount, rejectMaker, settleBalanceResult, err := l.getLendQuantity(lendTokenXDCPrice, collateralPrice, depositRate, borrowFee, coinbase, chain, header, statedb, order, &oldestOrder, maxTradedQuantity)
  if err != nil && err == lendingstate.ErrQuantityTradeTooSmall && tradedQuantity != nil && tradedQuantity.Sign() >= 0 {

accounts/abi/abi.go

@@ -79,19 +79,19 @@ func (abi ABI) Pack(name string, args ...interface{}) ([]byte, error) {
 // Unpack output in v according to the abi specification
 func (abi ABI) Unpack(v interface{}, name string, output []byte) (err error) {
  if len(output) == 0 {
- return fmt.Errorf("abi: unmarshalling empty output")
+ return errors.New("abi: unmarshalling empty output")
  }
  // since there can't be naming collisions with contracts and events,
  // we need to decide whether we're calling a method or an event
  if method, ok := abi.Methods[name]; ok {
  if len(output)%32 != 0 {
- return fmt.Errorf("abi: improperly formatted output")
+ return errors.New("abi: improperly formatted output")
  }
  return method.Outputs.Unpack(v, output)
  } else if event, ok := abi.Events[name]; ok {
  return event.Inputs.Unpack(v, output)
  }
- return fmt.Errorf("abi: could not locate named method or event")
+ return errors.New("abi: could not locate named method or event")
 }
 
 // UnmarshalJSON implements json.Unmarshaler interface

accounts/abi/bind/base.go

@@ -335,7 +335,7 @@ func (c *BoundContract) UnpackLog(out interface{}, event string, log types.Log)
  return errNoEventSignature
  }
  if log.Topics[0] != c.abi.Events[event].Id() {
- return fmt.Errorf("event signature mismatch")
+ return errors.New("event signature mismatch")
  }
  if len(log.Data) > 0 {
  if err := c.abi.Unpack(out, event, log.Data); err != nil {

accounts/abi/bind/util.go

@@ -18,7 +18,7 @@ package bind
 
 import (
  "context"
- "fmt"
+ "errors"
  "time"
 
  "github.com/XinFinOrg/XDPoSChain/common"
@@ -56,14 +56,14 @@ func WaitMined(ctx context.Context, b DeployBackend, tx *types.Transaction) (*ty
 // contract address when it is mined. It stops waiting when ctx is canceled.
 func WaitDeployed(ctx context.Context, b DeployBackend, tx *types.Transaction) (common.Address, error) {
  if tx.To() != nil {
- return common.Address{}, fmt.Errorf("tx is not contract creation")
+ return common.Address{}, errors.New("tx is not contract creation")
  }
  receipt, err := WaitMined(ctx, b, tx)
  if err != nil {
  return common.Address{}, err
  }
  if receipt.ContractAddress == (common.Address{}) {
- return common.Address{}, fmt.Errorf("zero address")
+ return common.Address{}, errors.New("zero address")
  }
  // Check that code has indeed been deployed at the address.
  // This matters on pre-Homestead chains: OOG in the constructor

accounts/abi/reflect.go

@@ -17,6 +17,7 @@
 package abi
 
 import (
+ "errors"
  "fmt"
  "reflect"
 )
@@ -117,7 +118,7 @@ func requireUniqueStructFieldNames(args Arguments) error {
  for _, arg := range args {
  field := capitalise(arg.Name)
  if field == "" {
- return fmt.Errorf("abi: purely underscored output cannot unpack to struct")
+ return errors.New("abi: purely underscored output cannot unpack to struct")
  }
  if exists[field] {
  return fmt.Errorf("abi: multiple outputs mapping to the same struct field '%s'", field)

accounts/abi/type.go

@@ -17,6 +17,7 @@
 package abi
 
 import (
+ "errors"
  "fmt"
  "reflect"
  "regexp"
@@ -61,7 +62,7 @@ var (
 func NewType(t string) (typ Type, err error) {
  // check that array brackets are equal if they exist
  if strings.Count(t, "[") != strings.Count(t, "]") {
- return Type{}, fmt.Errorf("invalid arg type in abi")
+ return Type{}, errors.New("invalid arg type in abi")
  }
 
  typ.stringKind = t
@@ -98,7 +99,7 @@ func NewType(t string) (typ Type, err error) {
  }
  typ.Type = reflect.ArrayOf(typ.Size, embeddedType.Type)
  } else {
- return Type{}, fmt.Errorf("invalid formatting of array type")
+ return Type{}, errors.New("invalid formatting of array type")
  }
  return typ, err
  }

accounts/abi/unpack.go

@@ -18,6 +18,7 @@ package abi
 
 import (
  "encoding/binary"
+ "errors"
  "fmt"
  "math/big"
  "reflect"
@@ -70,7 +71,7 @@ func readBool(word []byte) (bool, error) {
 // This enforces that standard by always presenting it as a 24-array (address + sig = 24 bytes)
 func readFunctionType(t Type, word []byte) (funcTy [24]byte, err error) {
  if t.T != FunctionTy {
- return [24]byte{}, fmt.Errorf("abi: invalid type in call to make function type byte array")
+ return [24]byte{}, errors.New("abi: invalid type in call to make function type byte array")
  }
  if garbage := binary.BigEndian.Uint64(word[24:32]); garbage != 0 {
  err = fmt.Errorf("abi: got improperly encoded function type, got %v", word)
@@ -83,7 +84,7 @@ func readFunctionType(t Type, word []byte) (funcTy [24]byte, err error) {
 // through reflection, creates a fixed array to be read from
 func readFixedBytes(t Type, word []byte) (interface{}, error) {
  if t.T != FixedBytesTy {
- return nil, fmt.Errorf("abi: invalid type in call to make fixed byte array")
+ return nil, errors.New("abi: invalid type in call to make fixed byte array")
  }
  // convert
  array := reflect.New(t.Type).Elem()
@@ -123,7 +124,7 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
  // declare our array
  refSlice = reflect.New(t.Type).Elem()
  } else {
- return nil, fmt.Errorf("abi: invalid type in array/slice unpacking stage")
+ return nil, errors.New("abi: invalid type in array/slice unpacking stage")
  }
 
  // Arrays have packed elements, resulting in longer unpack steps.

accounts/keystore/account_cache_test.go

@@ -17,6 +17,7 @@
 package keystore
 
 import (
+ "errors"
  "fmt"
  "math/rand"
  "os"
@@ -305,7 +306,7 @@ func waitForAccounts(wantAccounts []accounts.Account, ks *KeyStore) error {
  select {
  case <-ks.changes:
  default:
- return fmt.Errorf("wasn't notified of new accounts")
+ return errors.New("wasn't notified of new accounts")
  }
  return nil
  }

accounts/keystore/keystore.go

@@ -24,7 +24,6 @@ import (
  "crypto/ecdsa"
  crand "crypto/rand"
  "errors"
- "fmt"
  "math/big"
  "os"
  "path/filepath"
@@ -455,7 +454,7 @@ func (ks *KeyStore) Import(keyJSON []byte, passphrase, newPassphrase string) (ac
 func (ks *KeyStore) ImportECDSA(priv *ecdsa.PrivateKey, passphrase string) (accounts.Account, error) {
  key := newKeyFromECDSA(priv)
  if ks.cache.hasAddress(key.Address) {
- return accounts.Account{}, fmt.Errorf("account already exists")
+ return accounts.Account{}, errors.New("account already exists")
  }
  return ks.importKey(key, passphrase)
 }

bmt/bmt_test.go

@@ -19,6 +19,7 @@ package bmt
 import (
  "bytes"
  crand "crypto/rand"
+ "errors"
  "fmt"
  "hash"
  "io"
@@ -288,7 +289,7 @@ func TestHasherConcurrency(t *testing.T) {
  var err error
  select {
  case <-time.NewTimer(5 * time.Second).C:
- err = fmt.Errorf("timed out")
+ err = errors.New("timed out")
  case err = <-errc:
  }
  if err != nil {
@@ -321,7 +322,7 @@ func testHasherCorrectness(bmt hash.Hash, hasher BaseHasher, d []byte, n, count
  }()
  select {
  case <-timeout.C:
- err = fmt.Errorf("BMT hash calculation timed out")
+ err = errors.New("BMT hash calculation timed out")
  case err = <-c:
  }
  return err

cmd/utils/cmd.go

@@ -19,6 +19,7 @@ package utils
 
 import (
  "compress/gzip"
+ "errors"
  "fmt"
  "io"
  "os"
@@ -130,7 +131,7 @@ func ImportChain(chain *core.BlockChain, fn string) error {
  for batch := 0; ; batch++ {
  // Load a batch of RLP blocks.
  if checkInterrupt() {
- return fmt.Errorf("interrupted")
+ return errors.New("interrupted")
  }
  i := 0
  for ; i < importBatchSize; i++ {
@@ -153,7 +154,7 @@ func ImportChain(chain *core.BlockChain, fn string) error {
  }
  // Import the batch.
  if checkInterrupt() {
- return fmt.Errorf("interrupted")
+ return errors.New("interrupted")
  }
  missing := missingBlocks(chain, blocks[:i])
  if len(missing) == 0 {

common/countdown/countdown_test.go

@@ -1,7 +1,7 @@
 package countdown
 
 import (
- "fmt"
+ "errors"
  "testing"
  "time"
 
@@ -76,7 +76,7 @@ func TestCountdownShouldResetEvenIfErrored(t *testing.T) {
  called := make(chan int)
  OnTimeoutFn := func(time.Time, interface{}) error {
  called <- 1
- return fmt.Errorf("ERROR!")
+ return errors.New("ERROR!")
  }
 
  countdown := NewCountDown(5000 * time.Millisecond)

consensus/XDPoS/XDPoS.go

@@ -17,6 +17,7 @@
 package XDPoS
 
 import (
+ "errors"
  "fmt"
  "math/big"
 
@@ -438,7 +439,7 @@ func (x *XDPoS) CalculateMissingRounds(chain consensus.ChainReader, header *type
  case params.ConsensusEngineVersion2:
  return x.EngineV2.CalculateMissingRounds(chain, header)
  default: // Default "v1"
- return nil, fmt.Errorf("Not supported in the v1 consensus")
+ return nil, errors.New("Not supported in the v1 consensus")
  }
 }
 

consensus/XDPoS/engines/engine_v1/engine.go

@@ -686,7 +686,7 @@ func (x *XDPoS_v1) GetValidator(creator common.Address, chain consensus.ChainRea
  if no%epoch == 0 {
  cpHeader = header
  } else {
- return common.Address{}, fmt.Errorf("couldn't find checkpoint header")
+ return common.Address{}, errors.New("couldn't find checkpoint header")
  }
  }
  m, err := getM1M2FromCheckpointHeader(cpHeader, header, chain.Config())