chore(unification): rename KeeperBuilder to Builder (#2471)

umee-network · Mar 25, 2024 · 764a5c4 · 764a5c4
1 parent f8e7d34
commit 764a5c4
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 37 deletions.
diff --git a/app/app.go b/app/app.go
@@ -281,7 +281,7 @@ type UmeeApp struct {
 	LeverageKeeper      leveragekeeper.Keeper
 	IncentiveKeeper     incentivekeeper.Keeper
 	OracleKeeper        oraclekeeper.Keeper
-	UIbcQuotaKeeperB    uibcquota.KeeperBuilder
+	UIbcQuotaKeeperB    uibcquota.Builder
 	UGovKeeperB         ugovkeeper.Builder
 	MetokenKeeperB      metokenkeeper.Builder
 
@@ -461,7 +461,7 @@ func New(
 
 	app.NFTKeeper = nftkeeper.NewKeeper(keys[nftkeeper.StoreKey], appCodec, app.AccountKeeper, app.BankKeeper)
 
-	app.UGovKeeperB = ugovkeeper.NewKeeperBuilder(appCodec, keys[ugov.ModuleName])
+	app.UGovKeeperB = ugovkeeper.NewBuilder(appCodec, keys[ugov.ModuleName])
 
 	app.OracleKeeper = oraclekeeper.NewKeeper(
 		appCodec,
@@ -494,7 +494,7 @@ func New(
 	)
 	app.LeverageKeeper.SetBondHooks(app.IncentiveKeeper.BondHooks())
 
-	app.MetokenKeeperB = metokenkeeper.NewKeeperBuilder(
+	app.MetokenKeeperB = metokenkeeper.NewBuilder(
 		appCodec,
 		keys[metoken.StoreKey],
 		app.BankKeeper,
@@ -538,7 +538,7 @@ func New(
 	)
 
 	// UIbcQuotaKeeper implements ibcporttypes.ICS4Wrapper
-	app.UIbcQuotaKeeperB = uibcquota.NewKeeperBuilder(
+	app.UIbcQuotaKeeperB = uibcquota.NewBuilder(
 		appCodec, keys[uibc.StoreKey],
 		app.LeverageKeeper, uibcoracle.FromUmeeAvgPriceOracle(app.OracleKeeper), app.UGovKeeperB.EmergencyGroup,
 	)

diff --git a/x/metoken/keeper/intest/keeper_test.go b/x/metoken/keeper/intest/keeper_test.go
@@ -54,7 +54,7 @@ func initTestSuite(t *testing.T, registry []metoken.Index, balances []metoken.In
 		AnyTimes()
 	oracleMock.EXPECT().SetExchangeRate(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 
-	kb := keeper.NewKeeperBuilder(
+	kb := keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,

diff --git a/x/metoken/keeper/intest/msg_server_test.go b/x/metoken/keeper/intest/msg_server_test.go
@@ -607,7 +607,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) {
 		Return(initialPrices).
 		AnyTimes()
 
-	kb := keeper.NewKeeperBuilder(
+	kb := keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,
@@ -704,7 +704,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) {
 		Return(mocks.ValidPrices()).
 		AnyTimes()
 
-	kb = keeper.NewKeeperBuilder(
+	kb = keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,
@@ -1348,7 +1348,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) {
 		Return(initialPrices).
 		AnyTimes()
 
-	kb := keeper.NewKeeperBuilder(
+	kb := keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,
@@ -1445,7 +1445,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) {
 		Return(mocks.ValidPrices()).
 		AnyTimes()
 
-	kb = keeper.NewKeeperBuilder(
+	kb = keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,

diff --git a/x/metoken/keeper/keeper.go b/x/metoken/keeper/keeper.go
@@ -20,8 +20,8 @@ type Builder struct {
 	ugov           ugov.EmergencyGroupBuilder
 }
 
-// NewKeeperBuilder returns Builder object.
-func NewKeeperBuilder(
+// NewBuilder returns Builder object.
+func NewBuilder(
 	cdc codec.Codec,
 	storeKey storetypes.StoreKey,
 	bankKeeper metoken.BankKeeper,

diff --git a/x/metoken/keeper/unit_test.go b/x/metoken/keeper/unit_test.go
@@ -22,7 +22,7 @@ func initSimpleKeeper(t *testing.T) Keeper {
 	interfaceRegistry := types.NewInterfaceRegistry()
 	cdc := codec.NewProtoCodec(interfaceRegistry)
 	storeKey := storetypes.NewMemoryStoreKey("metoken")
-	kb := NewKeeperBuilder(cdc, storeKey, nil, nil, nil, nil)
+	kb := NewBuilder(cdc, storeKey, nil, nil, nil, nil)
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 
 	return kb.Keeper(&ctx)

diff --git a/x/ugov/keeper/intest/keeper.go b/x/ugov/keeper/intest/keeper.go
@@ -20,7 +20,7 @@ func MkKeeper(t *testing.T) (*sdk.Context, ugov.Keeper) {
 	ugov.RegisterInterfaces(ir)
 	cdc := codec.NewProtoCodec(ir)
 	storeKey := storetypes.NewMemoryStoreKey(ugov.StoreKey)
-	kb := keeper.NewKeeperBuilder(cdc, storeKey)
+	kb := keeper.NewBuilder(cdc, storeKey)
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 	return &ctx, kb.Keeper(&ctx)
 }
diff --git a/x/ugov/keeper/keeper.go b/x/ugov/keeper/keeper.go
@@ -15,7 +15,7 @@ type Builder struct {
 	Cdc      codec.BinaryCodec
 }
 
-func NewKeeperBuilder(
+func NewBuilder(
 	cdc codec.BinaryCodec, key storetypes.StoreKey,
 ) Builder {
 	return Builder{

diff --git a/x/uibc/module/module.go b/x/uibc/module/module.go
@@ -83,10 +83,10 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
 // AppModule represents the AppModule for this module
 type AppModule struct {
 	AppModuleBasic
-	kb quota.KeeperBuilder
+	kb quota.Builder
 }
 
-func NewAppModule(cdc codec.Codec, kb quota.KeeperBuilder) AppModule {
+func NewAppModule(cdc codec.Codec, kb quota.Builder) AppModule {
 	return AppModule{
 		AppModuleBasic: NewAppModuleBasic(cdc),
 		kb:             kb,

diff --git a/x/uibc/quota/genesis.go b/x/uibc/quota/genesis.go
@@ -8,7 +8,7 @@ import (
 
 // InitGenesis initializes the x/uibc module's state from a provided genesis
 // state.
-func (kb KeeperBuilder) InitGenesis(ctx sdk.Context, genState uibc.GenesisState) {
+func (kb Builder) InitGenesis(ctx sdk.Context, genState uibc.GenesisState) {
 	k := kb.Keeper(&ctx)
 	err := k.SetParams(genState.Params)
 	util.Panic(err)
@@ -23,7 +23,7 @@ func (kb KeeperBuilder) InitGenesis(ctx sdk.Context, genState uibc.GenesisState)
 }
 
 // ExportGenesis returns the x/uibc module's exported genesis state.
-func (kb KeeperBuilder) ExportGenesis(ctx sdk.Context) *uibc.GenesisState {
+func (kb Builder) ExportGenesis(ctx sdk.Context) *uibc.GenesisState {
 	k := kb.Keeper(&ctx)
 	outflows, err := k.GetAllOutflows()
 	util.Panic(err)

diff --git a/x/uibc/quota/grpc_query.go b/x/uibc/quota/grpc_query.go
@@ -11,11 +11,11 @@ var _ uibc.QueryServer = Querier{}
 
 // Querier implements a QueryServer for the x/uibc module.
 type Querier struct {
-	KeeperBuilder
+	Builder
 }
 
-func NewQuerier(kb KeeperBuilder) Querier {
-	return Querier{KeeperBuilder: kb}
+func NewQuerier(kb Builder) Querier {
+	return Querier{Builder: kb}
 }
 
 // Params returns params of the x/uibc module.

diff --git a/x/uibc/quota/intest/suite_test.go b/x/uibc/quota/intest/suite_test.go
@@ -107,6 +107,6 @@ func initKeeper(
 	storeKey := storetypes.NewMemoryStoreKey("quota")
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 	eg := ugovmocks.NewSimpleEmergencyGroupBuilder()
-	kb := quota.NewKeeperBuilder(cdc, storeKey, leverage, oracle, eg)
+	kb := quota.NewBuilder(cdc, storeKey, leverage, oracle, eg)
 	return ctx, kb.Keeper(&ctx)
 }
diff --git a/x/uibc/quota/keeper.go b/x/uibc/quota/keeper.go
@@ -13,20 +13,20 @@ import (
 	"github.com/umee-network/umee/v6/x/uibc"
 )
 
-// KeeperBuilder constructs Keeper by perparing all related dependencies (notably the store).
-type KeeperBuilder struct {
+// Builder constructs Keeper by perparing all related dependencies (notably the store).
+type Builder struct {
 	storeKey storetypes.StoreKey
 	cdc      codec.BinaryCodec
 	leverage uibc.Leverage
 	oracle   uibc.Oracle
 	ugov     ugov.EmergencyGroupBuilder
 }
 
-func NewKeeperBuilder(
+func NewBuilder(
 	cdc codec.BinaryCodec, key storetypes.StoreKey,
 	leverage uibc.Leverage, oracle uibc.Oracle, ugov ugov.EmergencyGroupBuilder,
-) KeeperBuilder {
-	return KeeperBuilder{
+) Builder {
+	return Builder{
 		cdc:      cdc,
 		storeKey: key,
 		leverage: leverage,
@@ -35,7 +35,7 @@ func NewKeeperBuilder(
 	}
 }
 
-func (kb KeeperBuilder) Keeper(ctx *sdk.Context) Keeper {
+func (kb Builder) Keeper(ctx *sdk.Context) Keeper {
 	return Keeper{
 		store:     ctx.KVStore(kb.storeKey),
 		leverage:  kb.leverage,

diff --git a/x/uibc/quota/msg_server.go b/x/uibc/quota/msg_server.go
@@ -11,11 +11,11 @@ import (
 var _ uibc.MsgServer = msgServer{}
 
 type msgServer struct {
-	kb KeeperBuilder
+	kb Builder
 }
 
 // NewMsgServerImpl returns an implementation of uibc.MsgServer
-func NewMsgServerImpl(kb KeeperBuilder) uibc.MsgServer {
+func NewMsgServerImpl(kb Builder) uibc.MsgServer {
 	return &msgServer{kb: kb}
 }
 

diff --git a/x/uibc/quota/unit_test.go b/x/uibc/quota/unit_test.go
@@ -25,7 +25,7 @@ func initKeeper(t *testing.T, l uibc.Leverage, o uibc.Oracle) TestKeeper {
 	ir := cdctypes.NewInterfaceRegistry()
 	cdc := codec.NewProtoCodec(ir)
 	storeKey := storetypes.NewMemoryStoreKey("quota")
-	kb := NewKeeperBuilder(cdc, storeKey, l, o, eg)
+	kb := NewBuilder(cdc, storeKey, l, o, eg)
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 	return TestKeeper{kb.Keeper(&ctx), t, &ctx}
 }

diff --git a/x/uibc/uics20/ibc_module.go b/x/uibc/uics20/ibc_module.go
@@ -24,14 +24,14 @@ var _ porttypes.IBCModule = ICS20Module{}
 // quota update on acknowledgement error or timeout.
 type ICS20Module struct {
 	porttypes.IBCModule
-	kb       quota.KeeperBuilder
+	kb       quota.Builder
 	leverage ltypes.MsgServer
 	cdc      codec.JSONCodec
 }
 
 // NewICS20Module is an IBCMiddlware constructor.
 // `app` must be an ICS20 app.
-func NewICS20Module(app porttypes.IBCModule, cdc codec.JSONCodec, k quota.KeeperBuilder, l ltypes.MsgServer,
+func NewICS20Module(app porttypes.IBCModule, cdc codec.JSONCodec, k quota.Builder, l ltypes.MsgServer,
 ) ICS20Module {
 	return ICS20Module{
 		IBCModule: app,

diff --git a/x/uibc/uics20/ibc_module_test.go b/x/uibc/uics20/ibc_module_test.go
@@ -62,7 +62,7 @@ func TestIBCOnRecvPacket(t *testing.T) {
 	storeKey := storetypes.NewMemoryStoreKey("quota")
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 	eg := ugovmocks.NewSimpleEmergencyGroupBuilder()
-	kb := quota.NewKeeperBuilder(cdc, storeKey, leverageMock, oracleMock, eg)
+	kb := quota.NewBuilder(cdc, storeKey, leverageMock, oracleMock, eg)
 	ics20Module := NewICS20Module(mockIBCModule, cdc, kb, mockLeverageMsgServer)
 
 	validMemoMsgs := func(noOfMsgs int, fallbackAddr string) string {

diff --git a/x/uibc/uics20/ics4_wrapper.go b/x/uibc/uics20/ics4_wrapper.go
@@ -14,10 +14,10 @@ import (
 type ICS4 struct {
 	porttypes.ICS4Wrapper
 
-	quotaKB quota.KeeperBuilder
+	quotaKB quota.Builder
 }
 
-func NewICS4(parent porttypes.ICS4Wrapper, kb quota.KeeperBuilder) ICS4 {
+func NewICS4(parent porttypes.ICS4Wrapper, kb quota.Builder) ICS4 {
 	return ICS4{parent, kb}
 }
 

diff --git a/x/uibc/uics20/ics4_wrapper_test.go b/x/uibc/uics20/ics4_wrapper_test.go
@@ -52,7 +52,7 @@ func TestSendPacket(t *testing.T) {
 
 	storeKey := storetypes.NewMemoryStoreKey("quota")
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
-	kb := quota.NewKeeperBuilder(codec.NewProtoCodec(nil), storeKey, leverageMock, oracleMock, eg)
+	kb := quota.NewBuilder(codec.NewProtoCodec(nil), storeKey, leverageMock, oracleMock, eg)
 	dp := uibc.DefaultParams()
 	keeper := kb.Keeper(&ctx)
 	keeper.SetParams(dp)