From d4eea298b33151028c61710042dfaf0a5ba52f8b Mon Sep 17 00:00:00 2001
From: "Felix C. Morency" <1102868+fmorency@users.noreply.github.com>
Date: Wed, 26 Jun 2024 16:23:08 -0400
Subject: [PATCH] fix(simulator): account keeper only used for testing

---
 keeper/keeper.go         | 10 ++++++----
 keeper/keeper_test.go    |  3 ++-
 module/depinject.go      |  4 +---
 simapp/app.go            |  2 +-
 simulation/operations.go |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/keeper/keeper.go b/keeper/keeper.go
index 11e8ed1..2af74de 100644
--- a/keeper/keeper.go
+++ b/keeper/keeper.go
@@ -24,7 +24,7 @@ type Keeper struct {
 	cdc codec.BinaryCodec
 
 	stakingKeeper *stakingkeeper.Keeper
-	accountKeeper AccountKeeper
+	accountKeeper AccountKeeper // for testing
 	slashKeeper   SlashingKeeper
 	bankKeeper    BankKeeper
 
@@ -47,7 +47,6 @@ func NewKeeper(
 	sk *stakingkeeper.Keeper,
 	slk SlashingKeeper,
 	bk BankKeeper,
-	ak AccountKeeper,
 	logger log.Logger,
 ) Keeper {
 	logger = logger.With(log.ModuleKey, "x/"+poa.ModuleName)
@@ -59,7 +58,6 @@ func NewKeeper(
 		stakingKeeper: sk,
 		slashKeeper:   slk,
 		bankKeeper:    bk,
-		accountKeeper: ak,
 		logger:        logger,
 
 		// Stores
@@ -99,10 +97,14 @@ func (k Keeper) GetBankKeeper() BankKeeper {
 	return k.bankKeeper
 }
 
-func (k Keeper) GetAccountKeeper() AccountKeeper {
+func (k *Keeper) GetTestAccountKeeper() AccountKeeper {
 	return k.accountKeeper
 }
 
+func (k *Keeper) SetTestAccountKeeper(ak AccountKeeper) {
+	k.accountKeeper = ak
+}
+
 // GetAdmins returns the module's administrators with delegation of power control.
 func (k Keeper) GetAdmins(ctx context.Context) []string {
 	p, err := k.GetParams(ctx)
diff --git a/keeper/keeper_test.go b/keeper/keeper_test.go
index dd90bc1..d26c6a4 100644
--- a/keeper/keeper_test.go
+++ b/keeper/keeper_test.go
@@ -90,7 +90,8 @@ func SetupTest(t *testing.T, baseValShares int64) *testFixture {
 	registerBaseSDKModules(f, encCfg, storeService, logger, require)
 
 	// Setup POA Keeper.
-	f.k = keeper.NewKeeper(encCfg.Codec, storeService, f.stakingKeeper, f.slashingKeeper, f.bankkeeper, f.accountkeeper, logger)
+	f.k = keeper.NewKeeper(encCfg.Codec, storeService, f.stakingKeeper, f.slashingKeeper, f.bankkeeper, logger)
+	f.k.SetTestAccountKeeper(f.accountkeeper)
 	f.msgServer = keeper.NewMsgServerImpl(f.k)
 	f.queryServer = keeper.NewQueryServerImpl(f.k)
 	f.appModule = poamodule.NewAppModule(encCfg.Codec, f.k)
diff --git a/module/depinject.go b/module/depinject.go
index 770f02e..927ffea 100644
--- a/module/depinject.go
+++ b/module/depinject.go
@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
@@ -48,7 +47,6 @@ type ModuleInputs struct {
 	StakingKeeper  stakingkeeper.Keeper
 	SlashingKeeper slashingkeeper.Keeper
 	BankKeeper     bankkeeper.Keeper
-	AccountKeeper  accountkeeper.AccountKeeper
 }
 
 type ModuleOutputs struct {
@@ -59,7 +57,7 @@ type ModuleOutputs struct {
 }
 
 func ProvideModule(in ModuleInputs) ModuleOutputs {
-	k := keeper.NewKeeper(in.Cdc, in.StoreService, &in.StakingKeeper, in.SlashingKeeper, in.BankKeeper, in.AccountKeeper, log.NewLogger(os.Stderr))
+	k := keeper.NewKeeper(in.Cdc, in.StoreService, &in.StakingKeeper, in.SlashingKeeper, in.BankKeeper, log.NewLogger(os.Stderr))
 	m := NewAppModule(in.Cdc, k)
 
 	return ModuleOutputs{Module: m, Keeper: k, Out: depinject.Out{}}
diff --git a/simapp/app.go b/simapp/app.go
index a7946cb..c9eb68a 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -320,9 +320,9 @@ func NewSimApp(
 		app.StakingKeeper,
 		app.SlashingKeeper,
 		app.BankKeeper,
-		app.AccountKeeper,
 		logger,
 	)
+	app.POAKeeper.SetTestAccountKeeper(app.AccountKeeper)
 
 	// register the staking hooks
 	// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
diff --git a/simulation/operations.go b/simulation/operations.go
index 0ec3409..3f5e01c 100644
--- a/simulation/operations.go
+++ b/simulation/operations.go
@@ -373,7 +373,7 @@ func newOperationInput(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, txGe
 		Msg:           msg,
 		Context:       ctx,
 		SimAccount:    simAccount,
-		AccountKeeper: k.GetAccountKeeper(),
+		AccountKeeper: k.GetTestAccountKeeper(),
 		Bankkeeper:    k.GetBankKeeper(),
 		ModuleName:    poatypes.ModuleName,
 	}