fix: shadowing of err

facundomedica · facundomedica · commit f30f863f7447 · 2024-05-02T16:28:56.000+02:00
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -913,8 +913,8 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res
 		if err != nil {
 			if mode == execModeReCheck {
 				// if the ante handler fails on recheck, we want to remove the tx from the mempool
-				if err := app.mempool.Remove(tx); err != nil {
-					return gInfo, nil, anteEvents, errors.Join(err, err)
+				if mempoolErr := app.mempool.Remove(tx); mempoolErr != nil {
+					return gInfo, nil, anteEvents, errors.Join(err, mempoolErr)
 				}
 			}
 			return gInfo, nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -913,8 +913,8 @@ func (app *BaseApp) runTx(mode execMode, txBytes []byte) (gInfo sdk.GasInfo, res`
`913`	`913`	`if err != nil {`
`914`	`914`	`if mode == execModeReCheck {`
`915`	`915`	`// if the ante handler fails on recheck, we want to remove the tx from the mempool`
`916`		`- if err := app.mempool.Remove(tx); err != nil {`
`917`		`- return gInfo, nil, anteEvents, errors.Join(err, err)`
	`916`	`+ if mempoolErr := app.mempool.Remove(tx); mempoolErr != nil {`
	`917`	`+ return gInfo, nil, anteEvents, errors.Join(err, mempoolErr)`
`918`	`918`	`}`
`919`	`919`	`}`
`920`	`920`	`return gInfo, nil, nil, err`