make tipPayee has a consistent format

neutron-org · Jan 27, 2025 · 43eb3b0 · 43eb3b0
1 parent 8be7ad2
commit 43eb3b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/x/feemarket/post/fee.go b/x/feemarket/post/fee.go
@@ -174,7 +174,13 @@ func (dfd FeeMarketDeductDecorator) PayOutFeeAndTip(ctx sdk.Context, fee, tip sd
 
 	proposer := sdk.AccAddress(ctx.BlockHeader().ProposerAddress)
 	if !tip.IsNil() {
-		tipPayee, err := SendTip(dfd.bankKeeper, ctx, params.SendTipToProposer, feeRecipientModule, proposer, sdk.NewCoins(tip))
+		tipPayee := proposer.String()
+
+		if !params.SendTipToProposer {
+			tipPayee = dfd.accountKeeper.GetModuleAddress(feeRecipientModule).String()
+		}
+
+		err := SendTip(dfd.bankKeeper, ctx, params.SendTipToProposer, feeRecipientModule, proposer, sdk.NewCoins(tip))
 		if err != nil {
 			return err
 		}
@@ -211,21 +217,18 @@ func SendTip(
 	feeRecipientModule string,
 	proposer sdk.AccAddress,
 	coins sdk.Coins,
-) (string, error) {
+) error {
 	var err error
 
-	tipPayee := feeRecipientModule
-
 	if sendToProposer {
 		err = bankKeeper.SendCoinsFromModuleToAccount(ctx, feemarkettypes.FeeCollectorName, proposer, coins)
-		tipPayee = proposer.String()
 	} else {
 		err = bankKeeper.SendCoinsFromModuleToModule(ctx, feemarkettypes.FeeCollectorName, feeRecipientModule, coins)
 	}
 
 	if err != nil {
-		return "", err
+		return err
 	}
 
-	return tipPayee, nil
+	return nil
 }
diff --git a/x/feemarket/post/fee_test.go b/x/feemarket/post/fee_test.go
@@ -187,7 +187,7 @@ func TestSendTip(t *testing.T) {
 					tc.coins).Return(nil).Once()
 			}
 
-			if _, err := post.SendTip(s.MockBankKeeper, s.Ctx, tc.sendToProposer, tc.recipientModule, accs[1].Account.GetAddress(), tc.coins); (err != nil) != tc.wantErr {
+			if err := post.SendTip(s.MockBankKeeper, s.Ctx, tc.sendToProposer, tc.recipientModule, accs[1].Account.GetAddress(), tc.coins); (err != nil) != tc.wantErr {
 				s.Errorf(err, "SendTip() error = %v, wantErr %v", err, tc.wantErr)
 			}
 		})