Skip to content

Commit

Permalink
updated simapp
Browse files Browse the repository at this point in the history
  • Loading branch information
faneaatiku committed Mar 15, 2024
1 parent e7eaac4 commit bd0295a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
27 changes: 25 additions & 2 deletions testutil/simapp/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import (
"github.com/bze-alphateam/bze/x/epochs"
epochskeeper "github.com/bze-alphateam/bze/x/epochs/keeper"
epochstypes "github.com/bze-alphateam/bze/x/epochs/types"
"github.com/bze-alphateam/bze/x/rewards"
rewardskeeper "github.com/bze-alphateam/bze/x/rewards/keeper"
rewardstypes "github.com/bze-alphateam/bze/x/rewards/types"
"github.com/bze-alphateam/bze/x/tradebin"
tradebinkeeper "github.com/bze-alphateam/bze/x/tradebin/keeper"
tradebintypes "github.com/bze-alphateam/bze/x/tradebin/types"
Expand Down Expand Up @@ -179,6 +182,7 @@ var (
tokenfactory.AppModuleBasic{},
tradebin.AppModuleBasic{},
epochs.AppModuleBasic{},
rewards.AppModuleBasic{},
// this line is used by starport scaffolding # stargate/app/moduleBasic
)

Expand All @@ -196,6 +200,8 @@ var (
burnermoduletypes.ModuleName: {authtypes.Burner},
tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner},
tradebintypes.ModuleName: nil,
epochstypes.ModuleName: nil,
rewardstypes.ModuleName: nil,
// this line is used by starport scaffolding # stargate/app/maccPerms
}

Expand Down Expand Up @@ -264,6 +270,7 @@ type SimApp struct {
TokenFactoryKeeper tokenfactorykeeper.Keeper
TradebinKeeper tradebinkeeper.Keeper
EpochsKeeper epochskeeper.Keeper
RewardsKeeper rewardskeeper.Keeper
// this line is used by starport scaffolding # stargate/app/keeperDeclaration

// the module manager
Expand Down Expand Up @@ -314,6 +321,7 @@ func New(
tokenfactorytypes.StoreKey,
tradebintypes.StoreKey,
epochstypes.StoreKey,
rewardstypes.StoreKey,
// this line is used by starport scaffolding # stargate/app/storeKey
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
Expand Down Expand Up @@ -460,13 +468,23 @@ func New(
nil, //no hooks registered
)

app.RewardsKeeper = *rewardskeeper.NewKeeper(
appCodec,
keys[rewardstypes.StoreKey],
keys[rewardstypes.MemStoreKey],
app.GetSubspace(rewardstypes.ModuleName),
app.BankKeeper,
app.DistrKeeper,
app.TradebinKeeper,
)

scavengeModule := scavengemodule.NewAppModule(appCodec, app.ScavengeKeeper)
cointrunkModule := cointrunkmodule.NewAppModule(appCodec, app.CointrunkKeeper, app.AccountKeeper, app.BankKeeper, app.DistrKeeper)
burnerModule := burnermodule.NewAppModule(appCodec, app.BurnerKeeper, app.AccountKeeper, app.BankKeeper)
tokenfactoryModule := tokenfactory.NewAppModule(appCodec, app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper)
tradebinModule := tradebin.NewAppModule(appCodec, app.TradebinKeeper, app.BankKeeper)
epochsModule := epochs.NewAppModule(appCodec, app.EpochsKeeper)

rewardsModule := rewards.NewAppModule(appCodec, app.RewardsKeeper, app.AccountKeeper, app.BankKeeper)
// this line is used by starport scaffolding # stargate/app/keeperDefinition

// register the proposal types
Expand Down Expand Up @@ -528,6 +546,7 @@ func New(
tokenfactoryModule,
tradebinModule,
epochsModule,
rewardsModule,
// this line is used by starport scaffolding # stargate/app/appModule
)

Expand Down Expand Up @@ -560,6 +579,7 @@ func New(
tokenfactorytypes.ModuleName,
tradebintypes.ModuleName,
epochstypes.ModuleName,
rewardstypes.ModuleName,
)

app.mm.SetOrderEndBlockers(
Expand Down Expand Up @@ -587,6 +607,7 @@ func New(
tokenfactorytypes.ModuleName,
tradebintypes.ModuleName,
epochstypes.ModuleName,
rewardstypes.ModuleName,
)

// NOTE: The genutils module must occur after staking so that pools are
Expand Down Expand Up @@ -619,6 +640,7 @@ func New(
tokenfactorytypes.ModuleName,
tradebintypes.ModuleName,
epochstypes.ModuleName,
rewardstypes.ModuleName,
// this line is used by starport scaffolding # stargate/app/initGenesis
)

Expand Down Expand Up @@ -692,7 +714,7 @@ func (app *SimApp) setupUpgradeHandlers() {

if upgradeInfo.Name == v700.UpgradeName {
storeUpgrades := storetypes.StoreUpgrades{
Added: []string{tokenfactorytypes.StoreKey, tradebintypes.StoreKey, epochstypes.StoreKey},
Added: []string{tokenfactorytypes.StoreKey, tradebintypes.StoreKey, epochstypes.StoreKey, rewardstypes.StoreKey},
}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
Expand Down Expand Up @@ -847,6 +869,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(burnermoduletypes.ModuleName)
paramsKeeper.Subspace(tokenfactorytypes.ModuleName)
paramsKeeper.Subspace(tradebintypes.ModuleName)
paramsKeeper.Subspace(rewardstypes.ModuleName)
// this line is used by starport scaffolding # stargate/app/paramSubspace

return paramsKeeper
Expand Down
1 change: 1 addition & 0 deletions x/rewards/keeper/keeper_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package keeper

0 comments on commit bd0295a

Please sign in to comment.