From ceb4d774ffd1a7dca8eacf7ab7cc84beb7e712c3 Mon Sep 17 00:00:00 2001 From: Solovyov1796 Date: Sat, 10 Aug 2024 10:18:21 +0800 Subject: [PATCH] add conuncil back --- app/app.go | 4 ++++ x/council/v1/module.go | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/app.go b/app/app.go index b2337526..b4d254ca 100644 --- a/app/app.go +++ b/app/app.go @@ -669,6 +669,7 @@ func NewApp( evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper), // nil InflationCalculationFn, use SDK's default inflation function mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace), + council.NewAppModule(app.CouncilKeeper), ibcwasm.NewAppModule(app.ibcWasmClientKeeper), ) @@ -711,6 +712,7 @@ func NewApp( paramstypes.ModuleName, authz.ModuleName, evmutiltypes.ModuleName, + counciltypes.ModuleName, consensusparamtypes.ModuleName, packetforwardtypes.ModuleName, ibcwasmtypes.ModuleName, @@ -745,6 +747,7 @@ func NewApp( authz.ModuleName, evmutiltypes.ModuleName, minttypes.ModuleName, + counciltypes.ModuleName, consensusparamtypes.ModuleName, packetforwardtypes.ModuleName, ibcwasmtypes.ModuleName, @@ -777,6 +780,7 @@ func NewApp( paramstypes.ModuleName, upgradetypes.ModuleName, validatorvestingtypes.ModuleName, + counciltypes.ModuleName, consensusparamtypes.ModuleName, packetforwardtypes.ModuleName, crisistypes.ModuleName, // runs the invariants at genesis, should run after other modules diff --git a/x/council/v1/module.go b/x/council/v1/module.go index cb970fb4..a2ad8e87 100644 --- a/x/council/v1/module.go +++ b/x/council/v1/module.go @@ -12,7 +12,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" @@ -97,18 +96,18 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { type AppModule struct { AppModuleBasic keeper keeper.Keeper - sk stakingkeeper.Keeper + // sk stakingkeeper.Keeper } // NewAppModule creates a new AppModule Object func NewAppModule( k keeper.Keeper, - sk stakingkeeper.Keeper, + // sk stakingkeeper.Keeper, ) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{}, keeper: k, - sk: sk, + // sk: sk, } }