move reasons to consts

Author: swift1337

baseapp/abci_utils.go

@@ -379,7 +379,7 @@ func (h *DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHan
 
 		for _, invalidTx := range invalidTxs {
 			reason := mempool.RemoveReason{
-				Caller: "prepare_proposal.remove_invalid_tx",
+				Caller: mempool.CallerPrepareProposalRemoveInvalid,
 				Error:  invalidTx.err,
 			}
 

baseapp/baseapp.go

@@ -882,7 +882,7 @@ func (app *BaseApp) RunTx(mode sdk.ExecMode, txBytes []byte, tx sdk.Tx, txIndex
 			if mode == execModeReCheck {
 				// if the ante handler fails on recheck, we want to remove the tx from the mempool
 				errMempool := mempool.RemoveWithReason(ctx, app.mempool, tx, mempool.RemoveReason{
-					Caller: "run_tx.recheck",
+					Caller: mempool.CallerRunTxRecheck,
 					Error:  err,
 				})
 
@@ -905,7 +905,8 @@ func (app *BaseApp) RunTx(mode sdk.ExecMode, txBytes []byte, tx sdk.Tx, txIndex
 			return gInfo, nil, anteEvents, err
 		}
 	case execModeFinalize:
-		err = mempool.RemoveWithReason(ctx, app.mempool, tx, mempool.RemoveReason{Caller: "run_tx.finalize"})
+		reason := mempool.RemoveReason{Caller: mempool.CallerRunTxFinalize}
+		err = mempool.RemoveWithReason(ctx, app.mempool, tx, reason)
 		if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
 			return gInfo, nil, anteEvents, fmt.Errorf("failed to remove tx from mempool: %w", err)
 		}

types/mempool/mempool.go

@@ -38,12 +38,21 @@ type ExtMempool interface {
 	RemoveWithReason(context.Context, sdk.Tx, RemoveReason) error
 }
 
+// RemovalCaller is the origin of the removal
+type RemovalCaller string
+
+// Various callers
+const (
+	CallerRunTxRecheck                 RemovalCaller = "run_tx.recheck"
+	CallerRunTxFinalize                RemovalCaller = "run_tx.finalize"
+	CallerPrepareProposalRemoveInvalid RemovalCaller = "prepare_proposal.remove_invalid"
+)
+
 // RemoveReason is the reason for removing a transaction from the mempool.
 type RemoveReason struct {
-	// Origin is the origin of the removal (eg. baseapp, cometbft, etc.)
-	Caller string
+	Caller RemovalCaller
 
-	// Error is an optional	 error that caused the removal.
+	// Error is an optional error that caused the removal.
 	Error error
 }