chore(x/): use cosmossdk.io/core/codec instead of github.com/cosmos/cosmos-sdk/codec (#23313)

This commit is contained in:
caseylove
2025-01-13 09:27:53 +00:00
committed by GitHub
parent e4d50b07da
commit bc9ce394cb
34 changed files with 284 additions and 110 deletions
+1 -1
View File
@@ -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"
)
+4 -3
View File
@@ -4,16 +4,17 @@ import (
"context"
"encoding/json"
"cosmossdk.io/core/codec"
"cosmossdk.io/errors"
"cosmossdk.io/x/group"
"github.com/cosmos/cosmos-sdk/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)
+6 -2
View File
@@ -10,6 +10,7 @@ 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"
@@ -17,7 +18,6 @@ import (
"cosmossdk.io/x/group/simulation"
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.
+31 -11
View File
@@ -4,10 +4,10 @@ import (
"bytes"
"fmt"
"cosmossdk.io/core/codec"
"cosmossdk.io/x/group"
"cosmossdk.io/x/group/keeper"
"github.com/cosmos/cosmos-sdk/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: