refactor(axelarnet): archive failed transfer

x/axelarnet/keeper/msg_server.go

@@ -255,27 +255,32 @@
 	}
 
 	for _, pendingTransfer := range pendingTransfers {
-		recipient, err := sdk.AccAddressFromBech32(pendingTransfer.Recipient.Address)
-		if err != nil {
-			s.Logger(ctx).Error(fmt.Sprintf("discard invalid recipient %s and continue", pendingTransfer.Recipient.Address))
-			s.nexus.ArchivePendingTransfer(ctx, pendingTransfer)
-			continue
-		}
+		s.nexus.ArchivePendingTransfer(ctx, pendingTransfer)
 
-		if err = transfer(ctx, s.Keeper, s.nexus, s.bank, s.ibcK, recipient, pendingTransfer.Asset); err != nil {
-			s.Logger(ctx).Error("failed to transfer asset to axelarnet", "err", err)
-			continue
-		}
+		success := utils.RunCached(ctx, s, func(ctx sdk.Context) (bool, error) {
+			recipient, err := sdk.AccAddressFromBech32(pendingTransfer.Recipient.Address)
+			if err != nil {
+				s.Logger(ctx).Error(fmt.Sprintf("discard invalid recipient %s and continue", pendingTransfer.Recipient.Address))
+				return false, err
+			}
 
-		events.Emit(ctx,
-			&types.AxelarTransferCompleted{
-				ID:         pendingTransfer.ID,
-				Receipient: pendingTransfer.Recipient.Address,
-				Asset:      pendingTransfer.Asset,
-				Recipient:  pendingTransfer.Recipient.Address,
-			})
+			if err = transfer(ctx, s.Keeper, s.nexus, s.bank, s.ibcK, recipient, pendingTransfer.Asset); err != nil {
+				s.Logger(ctx).Error("failed to transfer asset to axelarnet", "err", err)
+				return false, err
+			}
 
-		s.nexus.ArchivePendingTransfer(ctx, pendingTransfer)
+			return true, nil
+		})
+
+		if success {
+			events.Emit(ctx,
+				&types.AxelarTransferCompleted{
+					ID:         pendingTransfer.ID,
+					Receipient: pendingTransfer.Recipient.Address,
+					Asset:      pendingTransfer.Asset,
+					Recipient:  pendingTransfer.Recipient.Address,
+				})
+		}
 	}
 
 	// release transfer fees

x/axelarnet/keeper/msg_server_test.go

@@ -357,11 +357,12 @@ func TestHandleMsgExecutePendingTransfers(t *testing.T) {
 						}
 					}).
 					When2(requestIsMade).
-					Then("should not archive the transfer", func(t *testing.T) {
+					Then("should archive the failed transfer", func(t *testing.T) {
 						_, err := server.ExecutePendingTransfers(sdk.WrapSDKContext(ctx), req)
 						assert.NoError(t, err)
 
-						assert.Len(t, nexusK.ArchivePendingTransferCalls(), 0)
+						assert.Len(t, nexusK.ArchivePendingTransferCalls(), 1)
+						assert.Len(t, ctx.EventManager().Events(), 0)
 					}),
 
 				whenHasPendingTransfers.