git.delta.rocks / unique-network / refs/commits / 3673a425a08e

difftreelog

fix use Unlimited string

Daniel Shiposha2022-12-22parent: #528f102.patch.diff
in: master

3 files changed

modifiedtests/src/xcm/xcmOpal.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmOpal.test.ts
+++ b/tests/src/xcm/xcmOpal.test.ts
@@ -149,7 +149,7 @@
 
       const feeAssetItem = 0;
 
-      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
   });
@@ -204,7 +204,7 @@
       const feeAssetItem = 0;
 
       balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
-      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
 
       balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
 
@@ -277,7 +277,7 @@
 
     const feeItem = 1;
 
-    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, {Unlimited: null});
+    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
     
     // the commission has been paid in parachain native token
     balanceOpalFinal = await helper.balance.getSubstrate(alice.address);
@@ -339,7 +339,7 @@
 
       const feeAssetItem = 0;
 
-      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
     await helper.wait.newBlocks(3);
@@ -392,7 +392,7 @@
 
     const feeItem = 0;
 
-    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, {Unlimited: null});
+    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
 
     balanceBobFinal = await helper.balance.getSubstrate(bob.address);
     console.log('[Opal -> Relay (Westend)] transaction fees: %s OPL',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
modifiedtests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth
--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -183,7 +183,7 @@
 
       const feeAssetItem = 0;
 
-      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
   });
@@ -238,7 +238,7 @@
       const feeAssetItem = 0;
 
       balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
-      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
 
       balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
 
@@ -310,7 +310,7 @@
 
     const feeItem = 1;
 
-    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, {Unlimited: null});
+    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
     
     // the commission has been paid in parachain native token
     balanceQuartzFinal = await helper.balance.getSubstrate(alice.address);
@@ -370,7 +370,7 @@
 
       const feeAssetItem = 0;
 
-      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});
+      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     });
   
     await helper.wait.newBlocks(3);
@@ -425,7 +425,7 @@
 
     const feeItem = 0;
 
-    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, {Unlimited: null});
+    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
 
     balanceBobFinal = await helper.balance.getSubstrate(bob.address);
     console.log('[Quartz -> Relay (Westend)] transaction fees: %s QTZ',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
@@ -533,7 +533,7 @@
 
     const feeAssetItem = 0;
 
-    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});
+    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
     balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);
 
     const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;
@@ -581,7 +581,7 @@
         ForeignAsset: 0,
       };
 
-      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, {Unlimited: null});
+      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, 'Unlimited');
       balanceKaruraTokenFinal = await helper.balance.getSubstrate(randomAccount.address);
       balanceQuartzForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);
 
@@ -645,7 +645,7 @@
         Token: 'KAR',
       };
 
-      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, {Unlimited: null});
+      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, 'Unlimited');
     });
 
     const maxWaitBlocks = 3;
@@ -858,7 +858,7 @@
     };
     const amount = TRANSFER_AMOUNT;
 
-    await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, {Unlimited: null});
+    await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, 'Unlimited');
 
     balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccountQuartz.address);
     expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;
@@ -912,7 +912,7 @@
         },
       };
 
-      await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, {Unlimited: null});
+      await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, 'Unlimited');
 
       balanceMovrTokenFinal = await helper.balance.getEthereum(randomAccountMoonriver.address);
modifiedtests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth
183183
184      const feeAssetItem = 0;184      const feeAssetItem = 0;
185185
186      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});186      await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
187    });187    });
188  188  
189  });189  });
238      const feeAssetItem = 0;238      const feeAssetItem = 0;
239239
240      balanceStmnBefore = await helper.balance.getSubstrate(alice.address);240      balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
241      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, {Unlimited: null});241      await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
242242
243      balanceStmnAfter = await helper.balance.getSubstrate(alice.address);243      balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
244244
310310
311    const feeItem = 1;311    const feeItem = 1;
312312
313    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, {Unlimited: null});313    await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
314    314    
315    // the commission has been paid in parachain native token315    // the commission has been paid in parachain native token
316    balanceUniqueFinal = await helper.balance.getSubstrate(alice.address);316    balanceUniqueFinal = await helper.balance.getSubstrate(alice.address);
370370
371      const feeAssetItem = 0;371      const feeAssetItem = 0;
372372
373      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});373      await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
374    });374    });
375  375  
376    await helper.wait.newBlocks(3);376    await helper.wait.newBlocks(3);
425425
426    const feeItem = 0;426    const feeItem = 0;
427427
428    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, {Unlimited: null});428    await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
429429
430    balanceBobFinal = await helper.balance.getSubstrate(bob.address);430    balanceBobFinal = await helper.balance.getSubstrate(bob.address);
431    console.log('[Unique -> Relay (Westend)] transaction fees: %s UNQ',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));431    console.log('[Unique -> Relay (Westend)] transaction fees: %s UNQ',  helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
534534
535    const feeAssetItem = 0;535    const feeAssetItem = 0;
536536
537    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});537    await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
538    balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);538    balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);
539539
540    const unqFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;540    const unqFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;
583        ForeignAsset: 0,583        ForeignAsset: 0,
584      };584      };
585585
586      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, {Unlimited: null});586      await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, 'Unlimited');
587      balanceAcalaTokenFinal = await helper.balance.getSubstrate(randomAccount.address);587      balanceAcalaTokenFinal = await helper.balance.getSubstrate(randomAccount.address);
588      balanceUniqueForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);588      balanceUniqueForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);
589589
647        Token: 'ACA',647        Token: 'ACA',
648      };648      };
649649
650      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, {Unlimited: null});650      await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, 'Unlimited');
651    });651    });
652652
653    const maxWaitBlocks = 3;653    const maxWaitBlocks = 3;
842    };842    };
843    const amount = TRANSFER_AMOUNT;843    const amount = TRANSFER_AMOUNT;
844844
845    await helper.xTokens.transfer(randomAccountUnique, currencyId, amount, dest, {Unlimited: null});845    await helper.xTokens.transfer(randomAccountUnique, currencyId, amount, dest, 'Unlimited');
846846
847    balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccountUnique.address);847    balanceUniqueTokenMiddle = await helper.balance.getSubstrate(randomAccountUnique.address);
848    expect(balanceUniqueTokenMiddle < balanceUniqueTokenInit).to.be.true;848    expect(balanceUniqueTokenMiddle < balanceUniqueTokenInit).to.be.true;