diff --git a/x/auction/keeper/auction.go b/x/auction/keeper/auction.go index cd5c3d28..2ec0e321 100644 --- a/x/auction/keeper/auction.go +++ b/x/auction/keeper/auction.go @@ -102,7 +102,10 @@ func (k Keeper) ExtractBid(ctx sdk.Context, bidder sdk.AccAddress, bid sdk.Coin) var proposerReward sdk.Coins if params.ProposerFee.IsZero() { - return k.SendBid(ctx, bidder, escrowAddress, sdk.NewCoins(bid)) + // send the entire bid to the escrow account when no proposer fee is set + if err := k.bankKeeper.SendCoins(ctx, bidder, escrowAddress, sdk.NewCoins(bid)); err != nil { + return err + } } else { rewardsAddress, err := k.rewardsAddressProvider.GetRewardsAddress(ctx) if err != nil { @@ -115,7 +118,7 @@ func (k Keeper) ExtractBid(ctx sdk.Context, bidder sdk.AccAddress, bid sdk.Coin) bid := sdk.NewDecCoinsFromCoins(bid) proposerReward, _ = bid.MulDecTruncate(params.ProposerFee).TruncateDecimal() - if err := k.SendBid(ctx, bidder, rewardsAddress, proposerReward); err != nil { + if err := k.bankKeeper.SendCoins(ctx, bidder, rewardsAddress, proposerReward); err != nil { return err } @@ -124,7 +127,7 @@ func (k Keeper) ExtractBid(ctx sdk.Context, bidder sdk.AccAddress, bid sdk.Coin) escrowTotal := bid.Sub(sdk.NewDecCoinsFromCoins(proposerReward...)) escrowReward, _ := escrowTotal.TruncateDecimal() - if err := k.SendBid(ctx, bidder, escrowAddress, escrowReward); err != nil { + if err := k.bankKeeper.SendCoins(ctx, bidder, escrowAddress, escrowReward); err != nil { return err } } @@ -203,16 +206,6 @@ func (k Keeper) ValidateBundleTimeouts(bidInfo *types.BidInfo) error { return nil } -// SendBid sends the bid from the bidder to the relevant address. -func (k Keeper) SendBid(ctx sdk.Context, from, to sdk.AccAddress, bid sdk.Coins) error { - moduleAddress := k.accountKeeper.GetModuleAddress(types.ModuleName) - if moduleAddress.Equals(to) { - return k.bankKeeper.SendCoinsFromAccountToModule(ctx, from, types.ModuleName, bid) - } - - return k.bankKeeper.SendCoins(ctx, from, to, bid) -} - // filterSigners removes any signers from the currentSigners map that are not in the txSigners map. func filterSigners(currentSigners, txSigners map[string]struct{}) { for signer := range currentSigners { diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index af7d88d5..52740b97 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -18,7 +18,6 @@ type Keeper struct { cdc codec.BinaryCodec storeKey storetypes.StoreKey - accountKeeper types.AccountKeeper bankKeeper types.BankKeeper rewardsAddressProvider types.RewardsAddressProvider @@ -74,7 +73,6 @@ func NewKeeperWithRewardsAddressProvider( return Keeper{ cdc: cdc, storeKey: storeKey, - accountKeeper: accountKeeper, bankKeeper: bankKeeper, rewardsAddressProvider: rewardsAddressProvider, authority: authority, diff --git a/x/auction/types/expected_keepers.go b/x/auction/types/expected_keepers.go index 22dadcab..a1039798 100644 --- a/x/auction/types/expected_keepers.go +++ b/x/auction/types/expected_keepers.go @@ -16,7 +16,6 @@ type AccountKeeper interface { // //go:generate mockery --name BankKeeper --output ./mocks --outpkg mocks --case underscore type BankKeeper interface { - SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin } diff --git a/x/auction/types/mocks/account_keeper.go b/x/auction/types/mocks/account_keeper.go index a98ff41b..f0ddfcfb 100644 --- a/x/auction/types/mocks/account_keeper.go +++ b/x/auction/types/mocks/account_keeper.go @@ -33,7 +33,8 @@ func (_m *AccountKeeper) GetModuleAddress(moduleName string) types.AccAddress { func NewAccountKeeper(t interface { mock.TestingT Cleanup(func()) -}) *AccountKeeper { +}, +) *AccountKeeper { mock := &AccountKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/bank_keeper.go b/x/auction/types/mocks/bank_keeper.go index 0f891c0e..e18c7c4a 100644 --- a/x/auction/types/mocks/bank_keeper.go +++ b/x/auction/types/mocks/bank_keeper.go @@ -40,26 +40,13 @@ func (_m *BankKeeper) SendCoins(ctx types.Context, fromAddr types.AccAddress, to return r0 } -// SendCoinsFromAccountToModule provides a mock function with given fields: ctx, senderAddr, recipientModule, amt -func (_m *BankKeeper) SendCoinsFromAccountToModule(ctx types.Context, senderAddr types.AccAddress, recipientModule string, amt types.Coins) error { - ret := _m.Called(ctx, senderAddr, recipientModule, amt) - - var r0 error - if rf, ok := ret.Get(0).(func(types.Context, types.AccAddress, string, types.Coins) error); ok { - r0 = rf(ctx, senderAddr, recipientModule, amt) - } else { - r0 = ret.Error(0) - } - - return r0 -} - // NewBankKeeper creates a new instance of BankKeeper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewBankKeeper(t interface { mock.TestingT Cleanup(func()) -}) *BankKeeper { +}, +) *BankKeeper { mock := &BankKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/distribution_keeper.go b/x/auction/types/mocks/distribution_keeper.go index fd21a9e9..8301da90 100644 --- a/x/auction/types/mocks/distribution_keeper.go +++ b/x/auction/types/mocks/distribution_keeper.go @@ -33,7 +33,8 @@ func (_m *DistributionKeeper) GetPreviousProposerConsAddr(ctx types.Context) typ func NewDistributionKeeper(t interface { mock.TestingT Cleanup(func()) -}) *DistributionKeeper { +}, +) *DistributionKeeper { mock := &DistributionKeeper{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/rewards_address_provider.go b/x/auction/types/mocks/rewards_address_provider.go index 5c740bc1..6932fcd1 100644 --- a/x/auction/types/mocks/rewards_address_provider.go +++ b/x/auction/types/mocks/rewards_address_provider.go @@ -43,7 +43,8 @@ func (_m *RewardsAddressProvider) GetRewardsAddress(context types.Context) (type func NewRewardsAddressProvider(t interface { mock.TestingT Cleanup(func()) -}) *RewardsAddressProvider { +}, +) *RewardsAddressProvider { mock := &RewardsAddressProvider{} mock.Mock.Test(t) diff --git a/x/auction/types/mocks/staking_keeper.go b/x/auction/types/mocks/staking_keeper.go index b9163b16..47d818b4 100644 --- a/x/auction/types/mocks/staking_keeper.go +++ b/x/auction/types/mocks/staking_keeper.go @@ -35,7 +35,8 @@ func (_m *StakingKeeper) ValidatorByConsAddr(_a0 types.Context, _a1 types.ConsAd func NewStakingKeeper(t interface { mock.TestingT Cleanup(func()) -}) *StakingKeeper { +}, +) *StakingKeeper { mock := &StakingKeeper{} mock.Mock.Test(t)