refactoring antehandler

app/ante.go

@@ -27,23 +27,22 @@ func NewIsPausedDecorator(tk tokenfactory.Keeper) IsPausedDecorator {
 func (ad IsPausedDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (newCtx sdk.Context, err error) {
 	msgs := tx.GetMsgs()
 	for _, m := range msgs {
-		paused, _ := ad.tokenfactory.GetPaused(ctx)
 		switch m := m.(type) {
-		case *banktypes.MsgSend:
+		case *banktypes.MsgSend, *transfertypes.MsgTransfer:
+			paused, _ := ad.tokenfactory.GetPaused(ctx)
 			if paused.Paused {
 				return ctx, sdkerrors.Wrapf(tokenfactorytypes.ErrPaused, "can not perform token transfers")
 			}
-			_, found := ad.tokenfactory.GetBlacklisted(ctx, m.FromAddress)
-			if found {
-				return ctx, sdkerrors.Wrapf(tokenfactorytypes.ErrUnauthorized, "an account is blacklisted and can not transfer tokens")
+			var address string
+			switch m := m.(type) {
+			case *banktypes.MsgSend:
+				address = m.FromAddress
+			case *transfertypes.MsgTransfer:
+				address = m.Sender
 			}
-		case *transfertypes.MsgTransfer:
-			if paused.Paused {
-				return ctx, sdkerrors.Wrapf(tokenfactorytypes.ErrPaused, "can not perform IBC token transfers")
-			}
-			_, found := ad.tokenfactory.GetBlacklisted(ctx, m.Sender)
+			_, found := ad.tokenfactory.GetBlacklisted(ctx, address)
 			if found {
-				return ctx, sdkerrors.Wrapf(tokenfactorytypes.ErrUnauthorized, "an account is blacklisted and can not transfer tokens over IBC")
+				return ctx, sdkerrors.Wrapf(tokenfactorytypes.ErrUnauthorized, "an account is blacklisted and can not transfer tokens")
 			}
 		default:
 			continue