cleanup

bluzelle · Jan 15, 2021 · b482492 · b482492
1 parent 5b709d3
commit b482492
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/app/app.go b/app/app.go
@@ -319,6 +319,25 @@ func NewCRUDApp(
 	app.SetEndBlocker(app.EndBlocker)
 
 
+	addAnteHandler(app)
+
+
+
+
+	// initialize stores
+	app.MountKVStores(keys)
+	app.MountTransientStores(tkeys)
+
+	err := app.LoadLatestVersion(app.keys[bam.MainStoreKey])
+	if err != nil {
+		tmos.Exit(err.Error())
+	}
+
+	return app
+}
+
+
+func addAnteHandler(app *CRUDApp) {
 	authAnteHandler := auth.NewAnteHandler(
 		app.accountKeeper,
 		app.supplyKeeper,
@@ -346,19 +365,6 @@ func NewCRUDApp(
 		comboAnteHandler,
 	)
 
-
-
-
-	// initialize stores
-	app.MountKVStores(keys)
-	app.MountTransientStores(tkeys)
-
-	err := app.LoadLatestVersion(app.keys[bam.MainStoreKey])
-	if err != nil {
-		tmos.Exit(err.Error())
-	}
-
-	return app
 }
 
 

diff --git a/x/tax/ante/ante.go b/x/tax/ante/ante.go
@@ -136,11 +136,6 @@ func collectFeeTax( ctx sdk.Context, supplyKeeper types.SupplyKeeper, fromAcc ex
 				"insufficient funds to pay for tax fees; %s < %s", spendableCoins, taxFees)
 		}
 
-		//err := supplyKeeper.SendCoinsFromAccountToModule(ctx, fromAcc.GetAddress(), authtypes.FeeCollectorName, fees)
-		//if err != nil {
-		//	return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())
-		//}
-
 		err := supplyKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.FeeCollectorName, toAcc, taxFees)
 		if err != nil {
 			return sdkerrors.Wrapf(sdkerrors.ErrInsufficientFunds, err.Error())