diff --git a/app/app.go b/app/app.go index 95934f3763..fba111b06e 100644 --- a/app/app.go +++ b/app/app.go @@ -514,7 +514,7 @@ func New( app.LeverageKeeper, app.OracleKeeper, app.UGovKeeperB.EmergencyGroup, - // rewardsAuctionAccs.RewardsCollect, + rewardsAuctionAccs.RewardsCollect, ) // register the staking hooks diff --git a/x/metoken/keeper/intest/keeper_test.go b/x/metoken/keeper/intest/keeper_test.go index 446badc316..51b91f5b1b 100644 --- a/x/metoken/keeper/intest/keeper_test.go +++ b/x/metoken/keeper/intest/keeper_test.go @@ -54,20 +54,20 @@ func initTestSuite(t *testing.T, registry []metoken.Index, balances []metoken.In AnyTimes() oracleMock.EXPECT().SetExchangeRate(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes() - kb := keeper.NewBuilder( + app.MetokenKeeperB = keeper.NewBuilder( app.AppCodec(), app.GetKey(metoken.ModuleName), app.BankKeeper, app.LeverageKeeper, oracleMock, app.UGovKeeperB.EmergencyGroup, + app.AuctionKeeperB.Accs.RewardsCollect, ) - app.MetokenKeeperB = kb genState := metoken.DefaultGenesisState() genState.Registry = registry genState.Balances = balances - kb.Keeper(&ctx).InitGenesis(*genState) + app.MetokenKeeperB.Keeper(&ctx).InitGenesis(*genState) queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) metoken.RegisterQueryServer(queryHelper, keeper.NewQuerier(app.MetokenKeeperB)) diff --git a/x/metoken/keeper/intest/msg_server_test.go b/x/metoken/keeper/intest/msg_server_test.go index 36b6eded44..120b1ae804 100644 --- a/x/metoken/keeper/intest/msg_server_test.go +++ b/x/metoken/keeper/intest/msg_server_test.go @@ -616,6 +616,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) { app.LeverageKeeper, oracleMock, app.UGovKeeperB.EmergencyGroup, + app.AuctionKeeperB.Accs.RewardsCollect, ) app.MetokenKeeperB = kb msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB) @@ -714,6 +715,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) { app.LeverageKeeper, oracleMock, app.UGovKeeperB.EmergencyGroup, + app.AuctionKeeperB.Accs.RewardsCollect, ) app.MetokenKeeperB = kb msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB) @@ -1357,6 +1359,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) { app.LeverageKeeper, oracleMock, app.UGovKeeperB.EmergencyGroup, + app.AuctionKeeperB.Accs.RewardsCollect, ) app.MetokenKeeperB = kb msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB) @@ -1456,6 +1459,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) { app.LeverageKeeper, oracleMock, app.UGovKeeperB.EmergencyGroup, + app.AuctionKeeperB.Accs.RewardsCollect, ) app.MetokenKeeperB = kb msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB) diff --git a/x/metoken/keeper/keeper.go b/x/metoken/keeper/keeper.go index 58b7e53f4e..abce948659 100644 --- a/x/metoken/keeper/keeper.go +++ b/x/metoken/keeper/keeper.go @@ -18,6 +18,7 @@ type Builder struct { leverageKeeper metoken.LeverageKeeper oracleKeeper metoken.OracleKeeper ugov ugov.EmergencyGroupBuilder + rewardsAuction sdk.AccAddress } // NewBuilder returns Builder object. @@ -28,6 +29,7 @@ func NewBuilder( leverageKeeper metoken.LeverageKeeper, oracleKeeper metoken.OracleKeeper, ugov ugov.EmergencyGroupBuilder, + rewardsAuction sdk.AccAddress, ) Builder { return Builder{ cdc: cdc, @@ -36,6 +38,7 @@ func NewBuilder( leverageKeeper: leverageKeeper, oracleKeeper: oracleKeeper, ugov: ugov, + rewardsAuction: rewardsAuction, } } @@ -46,6 +49,7 @@ type Keeper struct { leverageKeeper metoken.LeverageKeeper oracleKeeper metoken.OracleKeeper ugov ugov.EmergencyGroupBuilder + rewardsAuction sdk.AccAddress // TODO: ctx should be removed when we migrate leverageKeeper and oracleKeeper ctx *sdk.Context @@ -60,6 +64,7 @@ func (b Builder) Keeper(ctx *sdk.Context) Keeper { leverageKeeper: b.leverageKeeper, oracleKeeper: b.oracleKeeper, ugov: b.ugov, + rewardsAuction: b.rewardsAuction, ctx: ctx, } } diff --git a/x/metoken/keeper/unit_test.go b/x/metoken/keeper/unit_test.go index 678b699198..ecdced59cc 100644 --- a/x/metoken/keeper/unit_test.go +++ b/x/metoken/keeper/unit_test.go @@ -8,6 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/stretchr/testify/require" + "github.com/umee-network/umee/v6/tests/accs" "github.com/umee-network/umee/v6/tests/tsdk" "github.com/umee-network/umee/v6/x/metoken" "github.com/umee-network/umee/v6/x/metoken/mocks" @@ -19,7 +20,7 @@ func initSimpleKeeper(t *testing.T) Keeper { interfaceRegistry := types.NewInterfaceRegistry() cdc := codec.NewProtoCodec(interfaceRegistry) storeKey := storetypes.NewMemoryStoreKey("metoken") - kb := NewBuilder(cdc, storeKey, nil, nil, nil, nil) + kb := NewBuilder(cdc, storeKey, nil, nil, nil, nil, accs.GenerateAddr("auction.Rewards")) ctx, _ := tsdk.NewCtxOneStore(t, storeKey) k := kb.Keeper(&ctx)