LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix: update x/protocolpool to use passed codecs to avoid nil pointer (#24594)

Browse Source
This commit is contained in:
Alex | Interchain Labs
2025-04-28 22:59:28 +00:00
committed by GitHub
parent 8475a2ba1a
commit e1b53c6c9d
6 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/protocolpool/depinject.go
+1 -1
View File
@@ -57,7 +57,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
}
k := keeper.NewKeeper(in.Codec, in.StoreService, in.AccountKeeper, in.BankKeeper, authorityAddr)
m := NewAppModule(in.Codec, k, in.AccountKeeper, in.BankKeeper)
m := NewAppModule(k, in.AccountKeeper, in.BankKeeper)
return ModuleOutputs{
Keeper: k,
x/protocolpool/module.go
+9 -11
View File
@@ -36,18 +36,16 @@ var (
// AppModule implements an application module for the pool module
type AppModule struct {
cdc codec.Codec
keeper keeper.Keeper
accountKeeper types.AccountKeeper
bankKeeper types.BankKeeper
}
// NewAppModule creates a new AppModule object
func NewAppModule(cdc codec.Codec, keeper keeper.Keeper,
func NewAppModule(keeper keeper.Keeper,
accountKeeper types.AccountKeeper, bankKeeper types.BankKeeper,
) AppModule {
return AppModule{
cdc: cdc,
keeper: keeper,
accountKeeper: accountKeeper,
bankKeeper: bankKeeper,
@@ -84,8 +82,8 @@ func (am AppModule) RegisterServices(configurator module.Configurator) {
}
// DefaultGenesis returns default genesis state as raw bytes for the protocolpool module.
func (am AppModule) DefaultGenesis(_ codec.JSONCodec) json.RawMessage {
data, err := am.cdc.MarshalJSON(types.DefaultGenesisState())
func (am AppModule) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
data, err := cdc.MarshalJSON(types.DefaultGenesisState())
if err != nil {
panic(err)
}
@@ -93,9 +91,9 @@ func (am AppModule) DefaultGenesis(_ codec.JSONCodec) json.RawMessage {
}
// ValidateGenesis performs genesis state validation for the protocolpool module.
func (am AppModule) ValidateGenesis(_ codec.JSONCodec, _ client.TxEncodingConfig, bz json.RawMessage) error {
func (am AppModule) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingConfig, bz json.RawMessage) error {
var data types.GenesisState
if err := am.cdc.UnmarshalJSON(bz, &data); err != nil {
if err := cdc.UnmarshalJSON(bz, &data); err != nil {
return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err)
}
@@ -103,9 +101,9 @@ func (am AppModule) ValidateGenesis(_ codec.JSONCodec, _ client.TxEncodingConfig
}
// InitGenesis performs genesis initialization for the protocolpool module.
func (am AppModule) InitGenesis(ctx sdk.Context, _ codec.JSONCodec, data json.RawMessage) {
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) {
var genesisState types.GenesisState
am.cdc.MustUnmarshalJSON(data, &genesisState)
cdc.MustUnmarshalJSON(data, &genesisState)
if err := am.keeper.InitGenesis(ctx, &genesisState); err != nil {
panic(fmt.Errorf("failed to init genesis state: %w", err))
@@ -113,12 +111,12 @@ func (am AppModule) InitGenesis(ctx sdk.Context, _ codec.JSONCodec, data json.Ra
}
// ExportGenesis returns the exported genesis state as raw bytes for the protocolpool module.
func (am AppModule) ExportGenesis(ctx sdk.Context, _ codec.JSONCodec) json.RawMessage {
func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
gs, err := am.keeper.ExportGenesis(ctx)
if err != nil {
panic(fmt.Errorf("failed to export genesis state: %w", err))
}
return am.cdc.MustMarshalJSON(gs)
return cdc.MustMarshalJSON(gs)
}
// BeginBlock implements appmodule.HasBeginBlocker.