From abbed8593ea31f34ebc9acb2e0ae0dbfa0f63212 Mon Sep 17 00:00:00 2001 From: Csongor Kiss Date: Fri, 22 Jul 2022 14:01:18 -0500 Subject: [PATCH] Fix simapp compilation The WormholeKeeper is just set to nil so we don't incur a circular dependency. The simapp test doesn't use that keeper anyway --- simapp/app.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/simapp/app.go b/simapp/app.go index 783774aa0..5126605cf 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -242,7 +242,8 @@ func NewSimApp( appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), ) stakingKeeper := stakingkeeper.NewKeeper( - appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), + // we set the WormholeKeeper to nil because it's not used for simapp and this way the circular dependency is avoided + appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, nil, app.GetSubspace(stakingtypes.ModuleName), ) app.MintKeeper = mintkeeper.NewKeeper( appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper, @@ -317,7 +318,8 @@ func NewSimApp( mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper), slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + // we set the WormholeKeeper to nil because it's not used for simapp and this way the circular dependency is avoided + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, nil), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), params.NewAppModule(app.ParamsKeeper),