From 509621e32c1716a24bc8279c9432aecc1e4ca182 Mon Sep 17 00:00:00 2001 From: ChengenH Date: Sat, 20 Apr 2024 15:47:17 +0800 Subject: [PATCH] perf: use errors.New to replace fmt.Errorf with no parameters --- packages/eventindexer/disperser/config.go | 3 ++- packages/fork-diff/main.go | 2 +- packages/relayer/bridge/config.go | 3 ++- packages/relayer/types.go | 16 ++++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/eventindexer/disperser/config.go b/packages/eventindexer/disperser/config.go index c53323f458..520e9ad759 100644 --- a/packages/eventindexer/disperser/config.go +++ b/packages/eventindexer/disperser/config.go @@ -3,6 +3,7 @@ package disperser import ( "crypto/ecdsa" "database/sql" + "errors" "fmt" "math/big" @@ -52,7 +53,7 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { dispersalAmount, ok := new(big.Int).SetString(c.String(flags.DispersalAmount.Name), 10) if !ok { - return nil, fmt.Errorf("Invalid dispersal amount") + return nil, errors.New("Invalid dispersal amount") } return &Config{ diff --git a/packages/fork-diff/main.go b/packages/fork-diff/main.go index 0edc06ee22..9417fe2570 100644 --- a/packages/fork-diff/main.go +++ b/packages/fork-diff/main.go @@ -201,7 +201,7 @@ func main() { err := enc.Encode(FilePatch{filePatch: fps.Patch}) if err != nil { - return "", fmt.Errorf("") + return "", errors.New("") } return string(t2html.Render(out.Bytes())), nil }, diff --git a/packages/relayer/bridge/config.go b/packages/relayer/bridge/config.go index 7ac417148f..37b8c200b6 100644 --- a/packages/relayer/bridge/config.go +++ b/packages/relayer/bridge/config.go @@ -2,6 +2,7 @@ package bridge import ( "crypto/ecdsa" + "errors" "fmt" "math/big" @@ -48,7 +49,7 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) { bridgeMessageValue, ok := new(big.Int).SetString(c.String(flags.BridgeMessageValue.Name), 10) if !ok { - return nil, fmt.Errorf("invalid bridgeMessageValue") + return nil, errors.New("invalid bridgeMessageValue") } return &Config{ diff --git a/packages/relayer/types.go b/packages/relayer/types.go index 66d0e82e64..83a1532ca6 100644 --- a/packages/relayer/types.go +++ b/packages/relayer/types.go @@ -146,13 +146,13 @@ func decodeDataAsERC20(decodedData []byte) (CanonicalToken, *big.Int, error) { chunks := splitByteArray(decodedData, 32) if len(chunks) < 4 { - return token, big.NewInt(0), fmt.Errorf("data too short") + return token, big.NewInt(0), errors.New("data too short") } offset, ok := new(big.Int).SetString(common.Bytes2Hex((chunks[canonicalTokenDataStartingindex])), 16) if !ok { - return token, big.NewInt(0), fmt.Errorf("data for BigInt is invalid") + return token, big.NewInt(0), errors.New("data for BigInt is invalid") } canonicalTokenData := decodedData[offset.Int64()+canonicalTokenDataStartingindex*32:] @@ -172,7 +172,7 @@ func decodeDataAsERC20(decodedData []byte) (CanonicalToken, *big.Int, error) { amount, ok := new(big.Int).SetString(common.Bytes2Hex((chunks[canonicalTokenDataStartingindex+3])), 16) if !ok { - return token, big.NewInt(0), fmt.Errorf("data for BigInt is invalid") + return token, big.NewInt(0), errors.New("data for BigInt is invalid") } return token, amount, nil @@ -187,7 +187,7 @@ func decodeDataAsNFT(decodedData []byte) (EventType, CanonicalToken, *big.Int, e offset, ok := new(big.Int).SetString(common.Bytes2Hex((chunks[canonicalTokenDataStartingindex])), 16) if !ok || offset.Int64()%32 != 0 { - return EventTypeSendETH, token, big.NewInt(0), fmt.Errorf("data for BigInt is invalid") + return EventTypeSendETH, token, big.NewInt(0), errors.New("data for BigInt is invalid") } canonicalTokenData := decodedData[offset.Int64()+canonicalTokenDataStartingindex*32:] @@ -211,14 +211,14 @@ func decodeDataAsNFT(decodedData []byte) (EventType, CanonicalToken, *big.Int, e } else if offset.Int64() == 160 { offset, ok := new(big.Int).SetString(common.Bytes2Hex((chunks[canonicalTokenDataStartingindex+4])), 16) if !ok || offset.Int64()%32 != 0 { - return EventTypeSendETH, token, big.NewInt(0), fmt.Errorf("data for BigInt is invalid") + return EventTypeSendETH, token, big.NewInt(0), errors.New("data for BigInt is invalid") } indexOffset := canonicalTokenDataStartingindex + int64(offset.Int64()/32) length, ok := new(big.Int).SetString(common.Bytes2Hex((chunks[indexOffset])), 16) if !ok { - return EventTypeSendETH, token, big.NewInt(0), fmt.Errorf("data for BigInt is invalid") + return EventTypeSendETH, token, big.NewInt(0), errors.New("data for BigInt is invalid") } amount := big.NewInt(0) @@ -364,7 +364,7 @@ func DecodeRevertReason(hexStr string) (string, error) { // Ensure the data is long enough to contain a valid revert reason if len(data) < 68 { - return "", fmt.Errorf("data too short to contain a valid revert reason") + return "", errors.New("data too short to contain a valid revert reason") } // The revert reason is encoded in the data returned by a failed transaction call @@ -377,7 +377,7 @@ func DecodeRevertReason(hexStr string) (string, error) { // Ensure the data contains the full revert string if uint64(len(data)) < 68+strLen { - return "", fmt.Errorf("data too short to contain the full revert reason") + return "", errors.New("data too short to contain the full revert reason") } // Extract the revert reason string