fix name of errorsmod

bandprotocol · Feb 3, 2024 · 3604f9a · 3604f9a
1 parent 8d661fa
commit 3604f9a
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 63 deletions.
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.19
 require (
 	cosmossdk.io/api v0.3.1
 	cosmossdk.io/errors v1.0.0
+	cosmossdk.io/math v1.1.2
 	github.com/bandprotocol/go-owasm v0.2.3
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cometbft/cometbft-db v0.8.0
@@ -44,7 +45,6 @@ require (
 	cosmossdk.io/core v0.5.1 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
 	cosmossdk.io/log v1.2.1 // indirect
-	cosmossdk.io/math v1.1.2 // indirect
 	cosmossdk.io/tools/rosetta v0.2.1 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect

diff --git a/x/globalfee/feechecker/feechecker.go b/x/globalfee/feechecker/feechecker.go
@@ -4,6 +4,7 @@ import (
 	"math"
 
 	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/authz"
@@ -38,7 +39,7 @@ func (fc FeeChecker) CheckTxFeeWithMinGasPrices(
 ) (sdk.Coins, int64, error) {
 	feeTx, ok := tx.(sdk.FeeTx)
 	if !ok {
-		return nil, 0, errors.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
+		return nil, 0, errorsmod.Wrap(sdkerrors.ErrTxDecode, "Tx must be a FeeTx")
 	}
 
 	feeCoins := feeTx.GetFee()

diff --git a/x/globalfee/keeper/msg_server.go b/x/globalfee/keeper/msg_server.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"context"
 
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
@@ -28,7 +28,7 @@ func (ms msgServer) UpdateParams(
 	req *types.MsgUpdateParams,
 ) (*types.MsgUpdateParamsResponse, error) {
 	if ms.authority != req.Authority {
-		return nil, errors.Wrapf(
+		return nil, errorsmod.Wrapf(
 			govtypes.ErrInvalidSigner,
 			"invalid authority; expected %s, got %s",
 			ms.authority,

diff --git a/x/globalfee/module.go b/x/globalfee/module.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -61,7 +61,7 @@ func (a AppModuleBasic) ValidateGenesis(
 	}
 
 	if err := data.Params.Validate(); err != nil {
-		return errors.Wrap(err, "params")
+		return errorsmod.Wrap(err, "params")
 	}
 
 	return nil

diff --git a/x/globalfee/types/genesis.go b/x/globalfee/types/genesis.go
@@ -3,7 +3,7 @@ package types
 import (
 	"encoding/json"
 
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/codec"
 )
 
@@ -33,7 +33,7 @@ func GetGenesisStateFromAppState(cdc codec.Codec, appState map[string]json.RawMe
 
 func ValidateGenesis(data GenesisState) error {
 	if err := data.Params.Validate(); err != nil {
-		return errors.Wrap(err, "globalfee params")
+		return errorsmod.Wrap(err, "globalfee params")
 	}
 
 	return nil

diff --git a/x/globalfee/types/msgs.go b/x/globalfee/types/msgs.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -31,7 +31,7 @@ func (m *MsgUpdateParams) GetSigners() []sdk.AccAddress {
 // ValidateBasic does a sanity check on the provided data.
 func (m *MsgUpdateParams) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil {
-		return errors.Wrap(err, "invalid authority address")
+		return errorsmod.Wrap(err, "invalid authority address")
 	}
 
 	if err := m.Params.Validate(); err != nil {

diff --git a/x/globalfee/types/params.go b/x/globalfee/types/params.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -22,7 +22,7 @@ func DefaultParams() Params {
 func validateMinimumGasPrices(i interface{}) error {
 	v, ok := i.(sdk.DecCoins)
 	if !ok {
-		return errors.Wrapf(sdkerrors.ErrInvalidType, "type: %T, expected sdk.DecCoins", i)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidType, "type: %T, expected sdk.DecCoins", i)
 	}
 
 	return v.Validate()

diff --git a/x/oracle/keeper/snapshotter.go b/x/oracle/keeper/snapshotter.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	"github.com/cometbft/cometbft/libs/log"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	snapshot "github.com/cosmos/cosmos-sdk/snapshots/types"
@@ -113,11 +113,11 @@ func (os *OracleSnapshotter) processAllItems(
 		if err == io.EOF {
 			break
 		} else if err != nil {
-			return errors.Wrap(err, "invalid protobuf message")
+			return errorsmod.Wrap(err, "invalid protobuf message")
 		}
 
 		if err := restore(ctx, os.keeper, payload, foundCode); err != nil {
-			return errors.Wrap(err, "processing snapshot item")
+			return errorsmod.Wrap(err, "processing snapshot item")
 		}
 	}
 

diff --git a/x/oracle/types/error.go b/x/oracle/types/error.go
@@ -1,57 +1,57 @@
 package types
 
 import (
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 var (
-	ErrOwasmCompilation         = errors.Register(ModuleName, 1, "owasm compilation failed")
-	ErrBadWasmExecution         = errors.Register(ModuleName, 2, "bad wasm execution")
-	ErrDataSourceNotFound       = errors.Register(ModuleName, 3, "data source not found")
-	ErrOracleScriptNotFound     = errors.Register(ModuleName, 4, "oracle script not found")
-	ErrRequestNotFound          = errors.Register(ModuleName, 5, "request not found")
-	ErrRawRequestNotFound       = errors.Register(ModuleName, 6, "raw request not found")
-	ErrReporterNotFound         = errors.Register(ModuleName, 7, "reporter not found")
-	ErrResultNotFound           = errors.Register(ModuleName, 8, "result not found")
-	ErrReporterAlreadyExists    = errors.Register(ModuleName, 9, "reporter already exists")
-	ErrValidatorNotRequested    = errors.Register(ModuleName, 10, "validator not requested")
-	ErrValidatorAlreadyReported = errors.Register(ModuleName, 11, "validator already reported")
-	ErrInvalidReportSize        = errors.Register(ModuleName, 12, "invalid report size")
-	ErrReporterNotAuthorized    = errors.Register(ModuleName, 13, "reporter not authorized")
-	ErrEditorNotAuthorized      = errors.Register(ModuleName, 14, "editor not authorized")
-	ErrValidatorAlreadyActive   = errors.Register(ModuleName, 16, "validator already active")
-	ErrTooSoonToActivate        = errors.Register(ModuleName, 17, "too soon to activate")
-	ErrTooLongName              = errors.Register(ModuleName, 18, "too long name")
-	ErrTooLongDescription       = errors.Register(ModuleName, 19, "too long description")
-	ErrEmptyExecutable          = errors.Register(ModuleName, 20, "empty executable")
-	ErrEmptyWasmCode            = errors.Register(ModuleName, 21, "empty wasm code")
-	ErrTooLargeExecutable       = errors.Register(ModuleName, 22, "too large executable")
-	ErrTooLargeWasmCode         = errors.Register(ModuleName, 23, "too large wasm code")
-	ErrInvalidMinCount          = errors.Register(ModuleName, 24, "invalid min count")
-	ErrInvalidAskCount          = errors.Register(ModuleName, 25, "invalid ask count")
-	ErrTooLargeCalldata         = errors.Register(ModuleName, 26, "too large calldata")
-	ErrTooLongClientID          = errors.Register(ModuleName, 27, "too long client id")
-	ErrEmptyRawRequests         = errors.Register(ModuleName, 28, "empty raw requests")
-	ErrEmptyReport              = errors.Register(ModuleName, 29, "empty report")
-	ErrDuplicateExternalID      = errors.Register(ModuleName, 30, "duplicate external id")
-	ErrTooLongSchema            = errors.Register(ModuleName, 31, "too long schema")
-	ErrTooLongURL               = errors.Register(ModuleName, 32, "too long url")
-	ErrTooLargeRawReportData    = errors.Register(ModuleName, 33, "too large raw report data")
-	ErrInsufficientValidators   = errors.Register(ModuleName, 34, "insufficient available validators")
-	ErrCreateWithDoNotModify    = errors.Register(ModuleName, 35, "cannot create with [do-not-modify] content")
-	ErrSelfReferenceAsReporter  = errors.Register(ModuleName, 36, "cannot reference self as reporter")
-	ErrOBIDecode                = errors.Register(ModuleName, 37, "obi decode failed")
-	ErrUncompressionFailed      = errors.Register(ModuleName, 38, "uncompression failed")
-	ErrRequestAlreadyExpired    = errors.Register(ModuleName, 39, "request already expired")
-	ErrBadDrbgInitialization    = errors.Register(ModuleName, 40, "bad drbg initialization")
-	ErrMaxOracleChannels        = errors.Register(ModuleName, 41, "max oracle channels")
-	ErrInvalidVersion           = errors.Register(ModuleName, 42, "invalid ICS20 version")
-	ErrNotEnoughFee             = errors.Register(ModuleName, 43, "not enough fee")
-	ErrInvalidOwasmGas          = errors.Register(ModuleName, 44, "invalid owasm gas")
-	ErrIBCRequestDisabled       = errors.Register(ModuleName, 45, "sending oracle request via IBC is disabled")
+	ErrOwasmCompilation         = errorsmod.Register(ModuleName, 1, "owasm compilation failed")
+	ErrBadWasmExecution         = errorsmod.Register(ModuleName, 2, "bad wasm execution")
+	ErrDataSourceNotFound       = errorsmod.Register(ModuleName, 3, "data source not found")
+	ErrOracleScriptNotFound     = errorsmod.Register(ModuleName, 4, "oracle script not found")
+	ErrRequestNotFound          = errorsmod.Register(ModuleName, 5, "request not found")
+	ErrRawRequestNotFound       = errorsmod.Register(ModuleName, 6, "raw request not found")
+	ErrReporterNotFound         = errorsmod.Register(ModuleName, 7, "reporter not found")
+	ErrResultNotFound           = errorsmod.Register(ModuleName, 8, "result not found")
+	ErrReporterAlreadyExists    = errorsmod.Register(ModuleName, 9, "reporter already exists")
+	ErrValidatorNotRequested    = errorsmod.Register(ModuleName, 10, "validator not requested")
+	ErrValidatorAlreadyReported = errorsmod.Register(ModuleName, 11, "validator already reported")
+	ErrInvalidReportSize        = errorsmod.Register(ModuleName, 12, "invalid report size")
+	ErrReporterNotAuthorized    = errorsmod.Register(ModuleName, 13, "reporter not authorized")
+	ErrEditorNotAuthorized      = errorsmod.Register(ModuleName, 14, "editor not authorized")
+	ErrValidatorAlreadyActive   = errorsmod.Register(ModuleName, 16, "validator already active")
+	ErrTooSoonToActivate        = errorsmod.Register(ModuleName, 17, "too soon to activate")
+	ErrTooLongName              = errorsmod.Register(ModuleName, 18, "too long name")
+	ErrTooLongDescription       = errorsmod.Register(ModuleName, 19, "too long description")
+	ErrEmptyExecutable          = errorsmod.Register(ModuleName, 20, "empty executable")
+	ErrEmptyWasmCode            = errorsmod.Register(ModuleName, 21, "empty wasm code")
+	ErrTooLargeExecutable       = errorsmod.Register(ModuleName, 22, "too large executable")
+	ErrTooLargeWasmCode         = errorsmod.Register(ModuleName, 23, "too large wasm code")
+	ErrInvalidMinCount          = errorsmod.Register(ModuleName, 24, "invalid min count")
+	ErrInvalidAskCount          = errorsmod.Register(ModuleName, 25, "invalid ask count")
+	ErrTooLargeCalldata         = errorsmod.Register(ModuleName, 26, "too large calldata")
+	ErrTooLongClientID          = errorsmod.Register(ModuleName, 27, "too long client id")
+	ErrEmptyRawRequests         = errorsmod.Register(ModuleName, 28, "empty raw requests")
+	ErrEmptyReport              = errorsmod.Register(ModuleName, 29, "empty report")
+	ErrDuplicateExternalID      = errorsmod.Register(ModuleName, 30, "duplicate external id")
+	ErrTooLongSchema            = errorsmod.Register(ModuleName, 31, "too long schema")
+	ErrTooLongURL               = errorsmod.Register(ModuleName, 32, "too long url")
+	ErrTooLargeRawReportData    = errorsmod.Register(ModuleName, 33, "too large raw report data")
+	ErrInsufficientValidators   = errorsmod.Register(ModuleName, 34, "insufficient available validators")
+	ErrCreateWithDoNotModify    = errorsmod.Register(ModuleName, 35, "cannot create with [do-not-modify] content")
+	ErrSelfReferenceAsReporter  = errorsmod.Register(ModuleName, 36, "cannot reference self as reporter")
+	ErrOBIDecode                = errorsmod.Register(ModuleName, 37, "obi decode failed")
+	ErrUncompressionFailed      = errorsmod.Register(ModuleName, 38, "uncompression failed")
+	ErrRequestAlreadyExpired    = errorsmod.Register(ModuleName, 39, "request already expired")
+	ErrBadDrbgInitialization    = errorsmod.Register(ModuleName, 40, "bad drbg initialization")
+	ErrMaxOracleChannels        = errorsmod.Register(ModuleName, 41, "max oracle channels")
+	ErrInvalidVersion           = errorsmod.Register(ModuleName, 42, "invalid ICS20 version")
+	ErrNotEnoughFee             = errorsmod.Register(ModuleName, 43, "not enough fee")
+	ErrInvalidOwasmGas          = errorsmod.Register(ModuleName, 44, "invalid owasm gas")
+	ErrIBCRequestDisabled       = errorsmod.Register(ModuleName, 45, "sending oracle request via IBC is disabled")
 )
 
 // WrapMaxError wraps an error message with additional info of the current and max values.
-func WrapMaxError(err *errors.Error, got int, max int) error {
+func WrapMaxError(err *errorsmod.Error, got int, max int) error {
 	return err.Wrapf("got: %d, max: %d", got, max)
 }
diff --git a/x/oracle/types/msgs.go b/x/oracle/types/msgs.go
@@ -3,7 +3,7 @@ package types
 import (
 	"bytes"
 
-	"cosmossdk.io/errors"
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -516,7 +516,7 @@ func (m *MsgUpdateParams) GetSigners() []sdk.AccAddress {
 // ValidateBasic does a sanity check on the provided data.
 func (m *MsgUpdateParams) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil {
-		return errors.Wrap(err, "invalid authority address")
+		return errorsmod.Wrap(err, "invalid authority address")
 	}
 
 	if err := m.Params.Validate(); err != nil {