updates error modules

x/epochs/types/epoch_info.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // StartInitialEpoch sets the epoch info fields to their start values
@@ -30,10 +30,10 @@ func (ei EpochInfo) Validate() error {
 		return ErrEpochDurationCannotBeZero
 	}
 	if ei.CurrentEpoch < 0 {
-		return sdkerrors.Wrapf(errors.New(fmt.Sprintf("%d", ei.CurrentEpoch)), ErrCurrentEpochCannotBeNegative.Error())
+		return errorsmod.Wrapf(errors.New(fmt.Sprintf("%d", ei.CurrentEpoch)), ErrCurrentEpochCannotBeNegative.Error())
 	}
 	if ei.CurrentEpochStartHeight < 0 {
-		return sdkerrors.Wrapf(errors.New(fmt.Sprintf("%d", ei.CurrentEpoch)), ErrCurrentEpochStartHeightCannotBeNegative.Error())
+		return errorsmod.Wrapf(errors.New(fmt.Sprintf("%d", ei.CurrentEpoch)), ErrCurrentEpochStartHeightCannotBeNegative.Error())
 	}
 	return nil
 }

x/epochs/types/errors.go

@@ -3,15 +3,15 @@ package types
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // x/epochs module sentinel errors
 var (
-	ErrSample                                  = sdkerrors.Register(ModuleName, 1100, "sample error")
-	ErrEpochIdentifierCannotBeEmpty            = sdkerrors.Register(ModuleName, 1101, "epoch identifier cannot be empty")
-	ErrEpochDurationCannotBeZero               = sdkerrors.Register(ModuleName, 1102, "epoch duration cannot be zero")
-	ErrCurrentEpochCannotBeNegative            = sdkerrors.Register(ModuleName, 1103, "current epoch cannot be negative")
-	ErrCurrentEpochStartHeightCannotBeNegative = sdkerrors.Register(ModuleName, 1104, "current epoch start height cannot be negative")
-	ErrDuplicatedEpochEntry                    = sdkerrors.Register(ModuleName, 1105, "duplicated epoch entry")
+	ErrSample                                  = errorsmod.Register(ModuleName, 1100, "sample error")
+	ErrEpochIdentifierCannotBeEmpty            = errorsmod.Register(ModuleName, 1101, "epoch identifier cannot be empty")
+	ErrEpochDurationCannotBeZero               = errorsmod.Register(ModuleName, 1102, "epoch duration cannot be zero")
+	ErrCurrentEpochCannotBeNegative            = errorsmod.Register(ModuleName, 1103, "current epoch cannot be negative")
+	ErrCurrentEpochStartHeightCannotBeNegative = errorsmod.Register(ModuleName, 1104, "current epoch start height cannot be negative")
+	ErrDuplicatedEpochEntry                    = errorsmod.Register(ModuleName, 1105, "duplicated epoch entry")
 )

x/epochs/types/genesis.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // DefaultIndex is the default global index
@@ -38,7 +38,7 @@ func (gs GenesisState) Validate() error {
 
 	for _, epoch := range gs.Epochs {
 		if epochIdentifiers[epoch.Identifier] {
-			return sdkerrors.Wrapf(errors.New(epoch.Identifier), ErrDuplicatedEpochEntry.Error())
+			return errorsmod.Wrapf(errors.New(epoch.Identifier), ErrDuplicatedEpochEntry.Error())
 		}
 		if err := epoch.Validate(); err != nil {
 			return err

x/registry/keeper/msg_server_register_second_level_domain.go

@@ -7,15 +7,15 @@ import (
 
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k msgServer) RegisterDomain(goCtx context.Context, msg *types.MsgRegisterDomain) (*types.MsgRegisterDomainResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if msg.RegistrationPeriodInYear < 1 || msg.RegistrationPeriodInYear > 4 {
-		return nil, sdkerrors.Wrapf(errors.New(fmt.Sprintf("%d year(s)", msg.RegistrationPeriodInYear)), types.ErrInvalidRegistrationPeriod.Error())
+		return nil, errorsmod.Wrapf(errors.New(fmt.Sprintf("%d year(s)", msg.RegistrationPeriodInYear)), types.ErrInvalidRegistrationPeriod.Error())
 	}
 
 	creatorAddress, err := sdk.AccAddressFromBech32(msg.Creator)

x/registry/keeper/msg_server_register_second_level_domain_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mycel-domain/mycel/testutil"
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (suite *KeeperTestSuite) TestRegisterSecondLevelDomain() {
@@ -50,7 +50,7 @@ func (suite *KeeperTestSuite) TestRegisterSecondLevelDomain() {
 			name:                     "foo",
 			parent:                   "cel",
 			registrationPeriodInYear: 1,
-			expErr:                   sdkerrors.Wrapf(errors.New(fmt.Sprintf("foo.cel")), types.ErrDomainIsAlreadyTaken.Error()),
+			expErr:                   errorsmod.Wrapf(errors.New(fmt.Sprintf("foo.cel")), types.ErrDomainIsAlreadyTaken.Error()),
 			fn: func() {
 				// Register domain once
 				domain := &types.MsgRegisterDomain{
@@ -68,7 +68,7 @@ func (suite *KeeperTestSuite) TestRegisterSecondLevelDomain() {
 			name:                     "foo",
 			parent:                   "xxx",
 			registrationPeriodInYear: 1,
-			expErr:                   sdkerrors.Wrapf(errors.New(fmt.Sprintf("xxx")), types.ErrParentDomainDoesNotExist.Error()),
+			expErr:                   errorsmod.Wrapf(errors.New(fmt.Sprintf("xxx")), types.ErrParentDomainDoesNotExist.Error()),
 			fn: func() {
 			},
 		},

x/registry/keeper/msg_server_register_top_level_domain.go

@@ -7,15 +7,15 @@ import (
 
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k msgServer) RegisterTopLevelDomain(goCtx context.Context, msg *types.MsgRegisterTopLevelDomain) (*types.MsgRegisterTopLevelDomainResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if msg.RegistrationPeriodInYear < 1 || msg.RegistrationPeriodInYear > 4 {
-		return nil, sdkerrors.Wrapf(errors.New(fmt.Sprintf("%d year(s)", msg.RegistrationPeriodInYear)), types.ErrInvalidRegistrationPeriod.Error())
+		return nil, errorsmod.Wrapf(errors.New(fmt.Sprintf("%d year(s)", msg.RegistrationPeriodInYear)), types.ErrInvalidRegistrationPeriod.Error())
 	}
 
 	creatorAddress, err := sdk.AccAddressFromBech32(msg.Creator)

x/registry/keeper/msg_server_register_top_level_domain_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mycel-domain/mycel/testutil"
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (suite *KeeperTestSuite) TestRegisterTopLevelDomain() {
@@ -37,7 +37,7 @@ func (suite *KeeperTestSuite) TestRegisterTopLevelDomain() {
 			creator:                  testutil.Alice,
 			name:                     "cel2",
 			registrationPeriodInYear: 1,
-			expErr:                   sdkerrors.Wrapf(errors.New(fmt.Sprintf("cel2")), types.ErrDomainIsAlreadyTaken.Error()),
+			expErr:                   errorsmod.Wrapf(errors.New(fmt.Sprintf("cel2")), types.ErrDomainIsAlreadyTaken.Error()),
 			fn: func() {
 				// Register domain once
 				domain := &types.MsgRegisterTopLevelDomain{

x/registry/keeper/msg_server_update_dns_record.go

@@ -7,16 +7,16 @@ import (
 
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k msgServer) UpdateDnsRecord(goCtx context.Context, msg *types.MsgUpdateDnsRecord) (*types.MsgUpdateDnsRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	domain, isFound := k.Keeper.GetSecondLevelDomain(ctx, msg.Name, msg.Parent)
 	if !isFound {
-		return nil, sdkerrors.Wrapf(errors.New(fmt.Sprintf("%s.%s", msg.Name, msg.Parent)), types.ErrDomainNotFound.Error())
+		return nil, errorsmod.Wrapf(errors.New(fmt.Sprintf("%s.%s", msg.Name, msg.Parent)), types.ErrDomainNotFound.Error())
 	}
 
 	// Check if the domain is owned by the creator

x/registry/keeper/msg_server_update_dns_record_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mycel-domain/mycel/testutil"
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (suite *KeeperTestSuite) TestUpdateDnsRecord() {
@@ -54,7 +54,7 @@ func (suite *KeeperTestSuite) TestUpdateDnsRecord() {
 			parent:        "fuga",
 			dnsRecordType: "A",
 			value:         "192.168.0.1",
-			expErr:        sdkerrors.Wrapf(errors.New(fmt.Sprintf("hoge.fuga")), types.ErrDomainNotFound.Error()),
+			expErr:        errorsmod.Wrapf(errors.New(fmt.Sprintf("hoge.fuga")), types.ErrDomainNotFound.Error()),
 			fn:            func() {},
 		},
 		{
@@ -63,7 +63,7 @@ func (suite *KeeperTestSuite) TestUpdateDnsRecord() {
 			parent:        "cel",
 			dnsRecordType: "A",
 			value:         "192.168.0.1",
-			expErr:        sdkerrors.Wrapf(errors.New(fmt.Sprintf(testutil.Bob)), types.ErrDomainNotEditable.Error()),
+			expErr:        errorsmod.Wrapf(errors.New(fmt.Sprintf(testutil.Bob)), types.ErrDomainNotEditable.Error()),
 			fn:            func() {},
 		},
 	}

x/registry/keeper/msg_server_update_wallet_record.go

@@ -7,16 +7,16 @@ import (
 
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k msgServer) UpdateWalletRecord(goCtx context.Context, msg *types.MsgUpdateWalletRecord) (*types.MsgUpdateWalletRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	domain, isFound := k.Keeper.GetSecondLevelDomain(ctx, msg.Name, msg.Parent)
 	if !isFound {
-		return nil, sdkerrors.Wrapf(errors.New(fmt.Sprintf("%s.%s", msg.Name, msg.Parent)), types.ErrDomainNotFound.Error())
+		return nil, errorsmod.Wrapf(errors.New(fmt.Sprintf("%s.%s", msg.Name, msg.Parent)), types.ErrDomainNotFound.Error())
 	}
 
 	// Check if the domain is owned by the creator

x/registry/keeper/msg_server_update_wallet_record_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/mycel-domain/mycel/testutil"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (suite *KeeperTestSuite) TestUpdateWalletRecord() {
@@ -73,7 +73,7 @@ func (suite *KeeperTestSuite) TestUpdateWalletRecord() {
 			parent:           "fuga",
 			walletRecordType: "ETHEREUM_MAINNET_MAINNET",
 			value:            "0x1234567890123456789012345678901234567890",
-			expErr:           sdkerrors.Wrapf(errors.New(fmt.Sprintf("hoge.fuga")), types.ErrDomainNotFound.Error()),
+			expErr:           errorsmod.Wrapf(errors.New(fmt.Sprintf("hoge.fuga")), types.ErrDomainNotFound.Error()),
 			fn:               func() {},
 		},
 		{
@@ -82,7 +82,7 @@ func (suite *KeeperTestSuite) TestUpdateWalletRecord() {
 			parent:           "cel",
 			walletRecordType: "ETHEREUM_MAINNET_MAINNET",
 			value:            "0x1234567890123456789012345678901234567890",
-			expErr:           sdkerrors.Wrapf(errors.New(fmt.Sprintf(testutil.Bob)), types.ErrDomainNotEditable.Error()),
+			expErr:           errorsmod.Wrapf(errors.New(fmt.Sprintf(testutil.Bob)), types.ErrDomainNotEditable.Error()),
 			fn:               func() {},
 		},
 	}

x/registry/keeper/register_second_level_domain.go

@@ -3,11 +3,12 @@ package keeper
 import (
 	"errors"
 	"fmt"
-	"github.com/mycel-domain/mycel/x/registry/types"
 	"strconv"
 
+	"github.com/mycel-domain/mycel/x/registry/types"
+
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 func (k Keeper) GetParentDomain(ctx sdk.Context, domain types.SecondLevelDomain) (parentDomain types.TopLevelDomain, found bool) {
@@ -77,7 +78,7 @@ func (k Keeper) RegisterDomain(ctx sdk.Context, domain types.SecondLevelDomain,
 
 	// Check if parent domain has subdomain registration config
 	if parentDomain.SubdomainConfig.MaxSubdomainRegistrations <= parentDomain.SubdomainCount {
-		err = sdkerrors.Wrapf(errors.New(fmt.Sprintf("%d", parentDomain.SubdomainCount)), types.ErrMaxSubdomainCountReached.Error())
+		err = errorsmod.Wrapf(errors.New(fmt.Sprintf("%d", parentDomain.SubdomainCount)), types.ErrMaxSubdomainCountReached.Error())
 		return err
 	}
 

x/registry/keeper/validate_registration.go

@@ -3,10 +3,11 @@ package keeper
 import (
 	"errors"
 	"fmt"
+
 	"github.com/mycel-domain/mycel/x/registry/types"
 
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
 // Get is domain already taken
@@ -39,7 +40,7 @@ func (k Keeper) ValidateRegisterTLD(ctx sdk.Context, domain types.TopLevelDomain
 func (k Keeper) ValidateRegisterSLD(ctx sdk.Context, domain types.SecondLevelDomain) (err error) {
 	isParentDomainExist := k.GetIsParentDomainExist(ctx, domain)
 	if !isParentDomainExist {
-		err = sdkerrors.Wrapf(errors.New(domain.Parent),
+		err = errorsmod.Wrapf(errors.New(domain.Parent),
 			types.ErrParentDomainDoesNotExist.Error())
 	}
 
@@ -50,7 +51,7 @@ func (k Keeper) ValidateRegisterSLD(ctx sdk.Context, domain types.SecondLevelDom
 func (k Keeper) ValidateRegsiterSubdomain(ctx sdk.Context, domain types.SecondLevelDomain) (err error) {
 	isParentDomainExist := k.GetIsParentDomainExist(ctx, domain)
 	if !isParentDomainExist {
-		err = sdkerrors.Wrapf(errors.New(domain.Parent),
+		err = errorsmod.Wrapf(errors.New(domain.Parent),
 			types.ErrParentDomainDoesNotExist.Error())
 	}
 	return err
@@ -66,7 +67,7 @@ func (k Keeper) ValidateSecondLevelDomain(ctx sdk.Context, domain types.SecondLe
 	// Check if domain is already taken
 	isDomainAlreadyTaken := k.GetIsDomainAlreadyTaken(ctx, domain)
 	if isDomainAlreadyTaken {
-		err = sdkerrors.Wrapf(errors.New(fmt.Sprintf("%s.%s", domain.Name, domain.Parent)),
+		err = errorsmod.Wrapf(errors.New(fmt.Sprintf("%s.%s", domain.Name, domain.Parent)),
 			types.ErrDomainIsAlreadyTaken.Error())
 		return err
 	}
@@ -98,7 +99,7 @@ func (k Keeper) ValidateTopLevelDomain(ctx sdk.Context, domain types.TopLevelDom
 	// Check if domain is already taken
 	isDomainAlreadyTaken := k.GetIsTopLevelDomainAlreadyTaken(ctx, domain)
 	if isDomainAlreadyTaken {
-		err = sdkerrors.Wrapf(errors.New(fmt.Sprintf("%s", domain.Name)),
+		err = errorsmod.Wrapf(errors.New(fmt.Sprintf("%s", domain.Name)),
 			types.ErrDomainIsAlreadyTaken.Error())
 		return err
 	}

x/registry/types/errors.go

@@ -3,24 +3,24 @@ package types
 // DONTCOVER
 
 import (
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	errorsmod "cosmossdk.io/errors"
 )
 
 // x/mycel module sentinel errors
 var (
-	ErrSample                    = sdkerrors.Register(ModuleName, 1100, "sample error")
-	ErrDomainIsAlreadyTaken      = sdkerrors.Register(ModuleName, 1101, "domain is already taken")
-	ErrInvalidDomainName         = sdkerrors.Register(ModuleName, 1102, "invalid name")
-	ErrInvalidDomainParent       = sdkerrors.Register(ModuleName, 1103, "invalid parent")
-	ErrDomainNotFound            = sdkerrors.Register(ModuleName, 1104, "domain not found")
-	ErrInvalidWalletAddress      = sdkerrors.Register(ModuleName, 1105, "invalid wallet address")
-	ErrInvalidWalletRecordType   = sdkerrors.Register(ModuleName, 1106, "invalid wallet record type")
-	ErrInvalidDnsRecordValue     = sdkerrors.Register(ModuleName, 1107, "invalid dns record value")
-	ErrInvalidDnsRecordType      = sdkerrors.Register(ModuleName, 1108, "invalid dns record type")
-	ErrDomainNotEditable         = sdkerrors.Register(ModuleName, 1109, "role not pemitted to edit the domain")
-	ErrParentDomainDoesNotExist  = sdkerrors.Register(ModuleName, 1110, "parent domain does not exist")
-	ErrParentDomainMustBeEmpty   = sdkerrors.Register(ModuleName, 1111, "parent domain must be empty")
-	ErrDomainNotRegistrable      = sdkerrors.Register(ModuleName, 1112, "domain is not registrable")
-	ErrMaxSubdomainCountReached  = sdkerrors.Register(ModuleName, 1113, "max subdomain count reached")
-	ErrInvalidRegistrationPeriod = sdkerrors.Register(ModuleName, 1114, "invalid registration period")
+	ErrSample                    = errorsmod.Register(ModuleName, 1100, "sample error")
+	ErrDomainIsAlreadyTaken      = errorsmod.Register(ModuleName, 1101, "domain is already taken")
+	ErrInvalidDomainName         = errorsmod.Register(ModuleName, 1102, "invalid name")
+	ErrInvalidDomainParent       = errorsmod.Register(ModuleName, 1103, "invalid parent")
+	ErrDomainNotFound            = errorsmod.Register(ModuleName, 1104, "domain not found")
+	ErrInvalidWalletAddress      = errorsmod.Register(ModuleName, 1105, "invalid wallet address")
+	ErrInvalidWalletRecordType   = errorsmod.Register(ModuleName, 1106, "invalid wallet record type")
+	ErrInvalidDnsRecordValue     = errorsmod.Register(ModuleName, 1107, "invalid dns record value")
+	ErrInvalidDnsRecordType      = errorsmod.Register(ModuleName, 1108, "invalid dns record type")
+	ErrDomainNotEditable         = errorsmod.Register(ModuleName, 1109, "role not pemitted to edit the domain")
+	ErrParentDomainDoesNotExist  = errorsmod.Register(ModuleName, 1110, "parent domain does not exist")
+	ErrParentDomainMustBeEmpty   = errorsmod.Register(ModuleName, 1111, "parent domain must be empty")
+	ErrDomainNotRegistrable      = errorsmod.Register(ModuleName, 1112, "domain is not registrable")
+	ErrMaxSubdomainCountReached  = errorsmod.Register(ModuleName, 1113, "max subdomain count reached")
+	ErrInvalidRegistrationPeriod = errorsmod.Register(ModuleName, 1114, "invalid registration period")
 )

x/registry/types/message_register_domain.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -42,7 +43,7 @@ func (msg *MsgRegisterDomain) GetSignBytes() []byte {
 func (msg *MsgRegisterDomain) ValidateBasic() error {
 	_, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
 	}
 	return nil
 }

x/registry/types/message_register_domain_test.go

@@ -17,18 +17,18 @@ func TestMsgRegisterDomain_ValidateBasic(t *testing.T) {
 		{
 			name: "invalid address",
 			msg: MsgRegisterDomain{
-				Creator: "invalid_address",
-				Name: "foo",
-				Parent: "cel",
+				Creator:                  "invalid_address",
+				Name:                     "foo",
+				Parent:                   "cel",
 				RegistrationPeriodInYear: 1,
 			},
 			err: sdkerrors.ErrInvalidAddress,
 		}, {
 			name: "valid address",
 			msg: MsgRegisterDomain{
-				Creator: sample.AccAddress(),
-				Name: "foo",
-				Parent: "cel",
+				Creator:                  sample.AccAddress(),
+				Name:                     "foo",
+				Parent:                   "cel",
 				RegistrationPeriodInYear: 1,
 			},
 		},