From 6f4f974ce0d7e8630a3572ac30f997d85d04bbca Mon Sep 17 00:00:00 2001 From: caseylove Date: Fri, 10 Jan 2025 11:16:00 +0800 Subject: [PATCH 1/3] chore(x/group,x/nft/x/mint): use cosmossdk.io/core/codec instead of github.com/cosmos/cosmos-sdk/codec --- x/group/keeper/genesis.go | 6 +++-- x/group/module/module.go | 8 +++++-- x/group/simulation/decoder.go | 42 ++++++++++++++++++++++++++--------- x/mint/module.go | 8 +++++-- x/nft/module/module.go | 8 +++++-- x/nft/simulation/decoder.go | 18 ++++++++++----- 6 files changed, 66 insertions(+), 24 deletions(-) diff --git a/x/group/keeper/genesis.go b/x/group/keeper/genesis.go index 8c30ee85e71e..4e022ebd7b30 100644 --- a/x/group/keeper/genesis.go +++ b/x/group/keeper/genesis.go @@ -7,13 +7,15 @@ import ( "cosmossdk.io/errors" "cosmossdk.io/x/group" - "github.com/cosmos/cosmos-sdk/codec" + "cosmossdk.io/core/codec" ) // InitGenesis initializes the group module's genesis state. func (k Keeper) InitGenesis(ctx context.Context, cdc codec.JSONCodec, data json.RawMessage) error { var genesisState group.GenesisState - cdc.MustUnmarshalJSON(data, &genesisState) + if err := cdc.UnmarshalJSON(data, &genesisState); err != nil { + panic(err) + } store := k.KVStoreService.OpenKVStore(ctx) diff --git a/x/group/module/module.go b/x/group/module/module.go index 5ffe3fe6234b..f0fda31417ed 100644 --- a/x/group/module/module.go +++ b/x/group/module/module.go @@ -16,8 +16,8 @@ import ( "cosmossdk.io/x/group/keeper" "cosmossdk.io/x/group/simulation" + "cosmossdk.io/core/codec" sdkclient "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/simsx" "github.com/cosmos/cosmos-sdk/types/module" @@ -118,7 +118,11 @@ func (am AppModule) EndBlock(ctx context.Context) error { // DefaultGenesis returns default genesis state as raw bytes for the group module. func (am AppModule) DefaultGenesis() json.RawMessage { - return am.cdc.MustMarshalJSON(group.NewGenesisState()) + data, err := am.cdc.MarshalJSON(group.NewGenesisState()) + if err != nil { + panic(err) + } + return data } // ValidateGenesis performs genesis state validation for the group module. diff --git a/x/group/simulation/decoder.go b/x/group/simulation/decoder.go index e1816520ae3c..31e1355d7acb 100644 --- a/x/group/simulation/decoder.go +++ b/x/group/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/x/group" "cosmossdk.io/x/group/keeper" - "github.com/cosmos/cosmos-sdk/codec" + "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/types/kv" ) @@ -19,36 +19,56 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { case bytes.Equal(kvA.Key[:1], []byte{keeper.GroupTablePrefix}): var groupA, groupB group.GroupInfo - cdc.MustUnmarshal(kvA.Value, &groupA) - cdc.MustUnmarshal(kvB.Value, &groupB) + if err := cdc.Unmarshal(kvA.Value, &groupA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &groupB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", groupA, groupB) case bytes.Equal(kvA.Key[:1], []byte{keeper.GroupMemberTablePrefix}): var memberA, memberB group.GroupMember - cdc.MustUnmarshal(kvA.Value, &memberA) - cdc.MustUnmarshal(kvB.Value, &memberB) + if err := cdc.Unmarshal(kvA.Value, &memberA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &memberB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", memberA, memberB) case bytes.Equal(kvA.Key[:1], []byte{keeper.GroupPolicyTablePrefix}): var accA, accB group.GroupPolicyInfo - cdc.MustUnmarshal(kvA.Value, &accA) - cdc.MustUnmarshal(kvB.Value, &accB) + if err := cdc.Unmarshal(kvA.Value, &accA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &accB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", accA, accB) case bytes.Equal(kvA.Key[:1], []byte{keeper.ProposalTablePrefix}): var propA, propB group.Proposal - cdc.MustUnmarshal(kvA.Value, &propA) - cdc.MustUnmarshal(kvB.Value, &propB) + if err := cdc.Unmarshal(kvA.Value, &propA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &propB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", propA, propB) case bytes.Equal(kvA.Key[:1], []byte{keeper.VoteTablePrefix}): var voteA, voteB group.Vote - cdc.MustUnmarshal(kvA.Value, &voteA) - cdc.MustUnmarshal(kvB.Value, &voteB) + if err := cdc.Unmarshal(kvA.Value, &voteA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &voteB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", voteA, voteB) default: diff --git a/x/mint/module.go b/x/mint/module.go index 882f7b7f91c4..ee4fe0c709cf 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -16,8 +16,8 @@ import ( "cosmossdk.io/x/mint/simulation" "cosmossdk.io/x/mint/types" + "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/simsx" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -110,7 +110,11 @@ func (am AppModule) RegisterMigrations(mr appmodule.MigrationRegistrar) error { // DefaultGenesis returns default genesis state as raw bytes for the mint module. func (am AppModule) DefaultGenesis() json.RawMessage { - return am.cdc.MustMarshalJSON(types.DefaultGenesisState()) + data, err := am.cdc.MarshalJSON(types.DefaultGenesisState()) + if err != nil { + panic(err) + } + return data } // ValidateGenesis performs genesis state validation for the mint module. diff --git a/x/nft/module/module.go b/x/nft/module/module.go index 16b82baf2a23..3d6f7888124e 100644 --- a/x/nft/module/module.go +++ b/x/nft/module/module.go @@ -14,8 +14,8 @@ import ( "cosmossdk.io/x/nft/keeper" "cosmossdk.io/x/nft/simulation" + "cosmossdk.io/core/codec" sdkclient "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/simsx" "github.com/cosmos/cosmos-sdk/types/module" @@ -85,7 +85,11 @@ func (AppModule) RegisterGRPCGatewayRoutes(clientCtx sdkclient.Context, mux *gwr // DefaultGenesis returns default genesis state as raw bytes for the nft module. func (am AppModule) DefaultGenesis() json.RawMessage { - return am.cdc.MustMarshalJSON(nft.DefaultGenesisState()) + data, err := am.cdc.MarshalJSON(nft.DefaultGenesisState()) + if err != nil { + panic(err) + } + return data } // ValidateGenesis performs genesis state validation for the nft module. diff --git a/x/nft/simulation/decoder.go b/x/nft/simulation/decoder.go index 7c7fcef4a0bf..12fff4fd7eed 100644 --- a/x/nft/simulation/decoder.go +++ b/x/nft/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/x/nft" "cosmossdk.io/x/nft/keeper" - "github.com/cosmos/cosmos-sdk/codec" + "cosmossdk.io/core/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" ) @@ -19,13 +19,21 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string { switch { case bytes.Equal(kvA.Key[:1], keeper.ClassKey): var classA, classB nft.Class - cdc.MustUnmarshal(kvA.Value, &classA) - cdc.MustUnmarshal(kvB.Value, &classB) + if err := cdc.Unmarshal(kvA.Value, &classA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &classB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", classA, classB) case bytes.Equal(kvA.Key[:1], keeper.NFTKey): var nftA, nftB nft.NFT - cdc.MustUnmarshal(kvA.Value, &nftA) - cdc.MustUnmarshal(kvB.Value, &nftB) + if err := cdc.Unmarshal(kvA.Value, &nftA); err != nil { + panic(err) + } + if err := cdc.Unmarshal(kvB.Value, &nftB); err != nil { + panic(err) + } return fmt.Sprintf("%v\n%v", nftA, nftB) case bytes.Equal(kvA.Key[:1], keeper.NFTOfClassByOwnerKey): return fmt.Sprintf("%v\n%v", kvA.Value, kvB.Value) From ca22ce574bacba9036c93a6fcd9d1de8db436497 Mon Sep 17 00:00:00 2001 From: caseylove Date: Fri, 10 Jan 2025 11:36:02 +0800 Subject: [PATCH 2/3] fix lint --- x/group/keeper/genesis.go | 3 +-- x/group/module/module.go | 2 +- x/group/simulation/decoder.go | 2 +- x/mint/module.go | 2 +- x/nft/module/module.go | 2 +- x/nft/simulation/decoder.go | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/x/group/keeper/genesis.go b/x/group/keeper/genesis.go index 4e022ebd7b30..e26d2420c5f9 100644 --- a/x/group/keeper/genesis.go +++ b/x/group/keeper/genesis.go @@ -4,10 +4,9 @@ import ( "context" "encoding/json" + "cosmossdk.io/core/codec" "cosmossdk.io/errors" "cosmossdk.io/x/group" - - "cosmossdk.io/core/codec" ) // InitGenesis initializes the group module's genesis state. diff --git a/x/group/module/module.go b/x/group/module/module.go index f0fda31417ed..e1d467ef8fde 100644 --- a/x/group/module/module.go +++ b/x/group/module/module.go @@ -10,13 +10,13 @@ import ( "google.golang.org/grpc" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/codec" "cosmossdk.io/core/registry" "cosmossdk.io/x/group" "cosmossdk.io/x/group/client/cli" "cosmossdk.io/x/group/keeper" "cosmossdk.io/x/group/simulation" - "cosmossdk.io/core/codec" sdkclient "github.com/cosmos/cosmos-sdk/client" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/simsx" diff --git a/x/group/simulation/decoder.go b/x/group/simulation/decoder.go index 31e1355d7acb..e7cc0a95ab35 100644 --- a/x/group/simulation/decoder.go +++ b/x/group/simulation/decoder.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" + "cosmossdk.io/core/codec" "cosmossdk.io/x/group" "cosmossdk.io/x/group/keeper" - "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/mint/module.go b/x/mint/module.go index ee4fe0c709cf..ff041541d526 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -10,13 +10,13 @@ import ( "cosmossdk.io/collections" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/codec" "cosmossdk.io/core/registry" "cosmossdk.io/schema" "cosmossdk.io/x/mint/keeper" "cosmossdk.io/x/mint/simulation" "cosmossdk.io/x/mint/types" - "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/simsx" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/nft/module/module.go b/x/nft/module/module.go index 3d6f7888124e..a3622d27f65d 100644 --- a/x/nft/module/module.go +++ b/x/nft/module/module.go @@ -8,13 +8,13 @@ import ( "google.golang.org/grpc" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/codec" "cosmossdk.io/core/registry" "cosmossdk.io/errors" "cosmossdk.io/x/nft" "cosmossdk.io/x/nft/keeper" "cosmossdk.io/x/nft/simulation" - "cosmossdk.io/core/codec" sdkclient "github.com/cosmos/cosmos-sdk/client" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/simsx" diff --git a/x/nft/simulation/decoder.go b/x/nft/simulation/decoder.go index 12fff4fd7eed..5290af153243 100644 --- a/x/nft/simulation/decoder.go +++ b/x/nft/simulation/decoder.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" + "cosmossdk.io/core/codec" "cosmossdk.io/x/nft" "cosmossdk.io/x/nft/keeper" - "cosmossdk.io/core/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" ) From d6d2a2965300ad6f643e70f30c873575033138d7 Mon Sep 17 00:00:00 2001 From: caseylove Date: Fri, 10 Jan 2025 12:25:40 +0800 Subject: [PATCH 3/3] update missing replacement --- x/group/internal/orm/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/group/internal/orm/types.go b/x/group/internal/orm/types.go index 11d113cd68a9..554520084c55 100644 --- a/x/group/internal/orm/types.go +++ b/x/group/internal/orm/types.go @@ -9,12 +9,12 @@ import ( "github.com/cosmos/gogoproto/proto" + "cosmossdk.io/core/codec" storetypes "cosmossdk.io/core/store" errorsmod "cosmossdk.io/errors" "cosmossdk.io/x/group/errors" "cosmossdk.io/x/group/internal/orm/prefixstore" - "github.com/cosmos/cosmos-sdk/codec" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" )