From bea9ecc68469bec2561ab908fa614cd37481e3e6 Mon Sep 17 00:00:00 2001
From: Facundo <facundomedica@gmail.com>
Date: Mon, 7 Oct 2024 19:44:53 -0300
Subject: [PATCH] ...

---
 x/bank/keeper/collections_test.go | 4 ++--
 x/bank/keeper/keeper_test.go      | 3 +--
 x/bank/types/expected_keepers.go  | 1 +
 x/feegrant/keeper/genesis_test.go | 2 +-
 x/feegrant/keeper/keeper_test.go  | 3 ---
 x/feegrant/module/abci_test.go    | 2 --
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/x/bank/keeper/collections_test.go b/x/bank/keeper/collections_test.go
index 6edee322dce1..f18fe08f434a 100644
--- a/x/bank/keeper/collections_test.go
+++ b/x/bank/keeper/collections_test.go
@@ -31,12 +31,13 @@ func TestBankStateCompatibility(t *testing.T) {
 	encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{})
 
 	env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
+	ac := codectestutil.CodecOptions{}.GetAddressCodec()
 
 	// gomock initializations
 	ctrl := gomock.NewController(t)
 	authKeeper := banktestutil.NewMockAccountKeeper(ctrl)
+	authKeeper.EXPECT().AddressCodec().Return(ac).AnyTimes()
 
-	ac := codectestutil.CodecOptions{}.GetAddressCodec()
 	addr, err := ac.BytesToString(accAddrs[4])
 	require.NoError(t, err)
 	authority, err := ac.BytesToString(authtypes.NewModuleAddress(banktypes.GovModuleName))
@@ -45,7 +46,6 @@ func TestBankStateCompatibility(t *testing.T) {
 	k := keeper.NewBaseKeeper(
 		env,
 		encCfg.Codec,
-		ac,
 		authKeeper,
 		map[string]bool{addr: true},
 		authority,
diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go
index 6d6ff607dad7..7c3c3d141fb8 100644
--- a/x/bank/keeper/keeper_test.go
+++ b/x/bank/keeper/keeper_test.go
@@ -144,13 +144,13 @@ func (suite *KeeperTestSuite) SetupTest() {
 	// gomock initializations
 	ctrl := gomock.NewController(suite.T())
 	authKeeper := banktestutil.NewMockAccountKeeper(ctrl)
+	authKeeper.EXPECT().AddressCodec().Return(ac).AnyTimes()
 	suite.ctx = ctx
 	suite.authKeeper = authKeeper
 	suite.addrCdc = ac
 	suite.bankKeeper = keeper.NewBaseKeeper(
 		env,
 		encCfg.Codec,
-		ac,
 		suite.authKeeper,
 		map[string]bool{addr: true},
 		authority,
@@ -317,7 +317,6 @@ func (suite *KeeperTestSuite) TestGetAuthority() {
 		return keeper.NewBaseKeeper(
 			env,
 			moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}).Codec,
-			suite.addrCdc,
 			suite.authKeeper,
 			nil,
 			authority,
diff --git a/x/bank/types/expected_keepers.go b/x/bank/types/expected_keepers.go
index f38abf8d4159..288d64a8f17d 100644
--- a/x/bank/types/expected_keepers.go
+++ b/x/bank/types/expected_keepers.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"cosmossdk.io/core/address"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 )
diff --git a/x/feegrant/keeper/genesis_test.go b/x/feegrant/keeper/genesis_test.go
index 0b0d54b0f602..68edd5915808 100644
--- a/x/feegrant/keeper/genesis_test.go
+++ b/x/feegrant/keeper/genesis_test.go
@@ -6,6 +6,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
+	address "cosmossdk.io/core/address"
 	coretesting "cosmossdk.io/core/testing"
 	"cosmossdk.io/math"
 	storetypes "cosmossdk.io/store/types"
@@ -13,7 +14,6 @@ import (
 	"cosmossdk.io/x/feegrant/keeper"
 	"cosmossdk.io/x/feegrant/module"
 
-	address "cosmossdk.io/core/address"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/feegrant/keeper/keeper_test.go b/x/feegrant/keeper/keeper_test.go
index 8b1e763ba471..7b9ed26b5d50 100644
--- a/x/feegrant/keeper/keeper_test.go
+++ b/x/feegrant/keeper/keeper_test.go
@@ -3,7 +3,6 @@ package keeper_test
 import (
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
 
 	"cosmossdk.io/core/header"
@@ -45,8 +44,6 @@ func (suite *KeeperTestSuite) SetupTest() {
 	encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}, module.AppModule{})
 
 	// setup gomock and initialize some globally expected executions
-	ctrl := gomock.NewController(suite.T())
-
 	ac := codecaddress.NewBech32Codec("cosmos")
 	for _, addr := range suite.addrs {
 		str, err := ac.BytesToString(addr)
diff --git a/x/feegrant/module/abci_test.go b/x/feegrant/module/abci_test.go
index e719ecb93766..0faa384493c8 100644
--- a/x/feegrant/module/abci_test.go
+++ b/x/feegrant/module/abci_test.go
@@ -3,7 +3,6 @@ package module_test
 import (
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
 	"cosmossdk.io/core/header"
@@ -38,7 +37,6 @@ func TestFeegrantPruning(t *testing.T) {
 	now := testCtx.Ctx.HeaderInfo().Time
 	oneDay := now.AddDate(0, 0, 1)
 
-	ctrl := gomock.NewController(t)
 	ac := address.NewBech32Codec("cosmos")
 
 	env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())