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
149149
150 const feeAssetItem = 0;150 const feeAssetItem = 0;
151151
152 await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});152 await helper.xcm.limitedReserveTransferAssets(alice, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
153 });153 });
154 154
155 });155 });
204 const feeAssetItem = 0;204 const feeAssetItem = 0;
205205
206 balanceStmnBefore = await helper.balance.getSubstrate(alice.address);206 balanceStmnBefore = await helper.balance.getSubstrate(alice.address);
207 await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, {Unlimited: null});207 await helper.xcm.limitedReserveTransferAssets(alice, dest, beneficiary, assets, feeAssetItem, 'Unlimited');
208208
209 balanceStmnAfter = await helper.balance.getSubstrate(alice.address);209 balanceStmnAfter = await helper.balance.getSubstrate(alice.address);
210210
277277
278 const feeItem = 1;278 const feeItem = 1;
279279
280 await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, {Unlimited: null});280 await helper.xTokens.transferMulticurrencies(alice, currencies, feeItem, destination, 'Unlimited');
281 281
282 // the commission has been paid in parachain native token282 // the commission has been paid in parachain native token
283 balanceOpalFinal = await helper.balance.getSubstrate(alice.address);283 balanceOpalFinal = await helper.balance.getSubstrate(alice.address);
339339
340 const feeAssetItem = 0;340 const feeAssetItem = 0;
341341
342 await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});342 await helper.xcm.limitedReserveTransferAssets(bob, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
343 });343 });
344 344
345 await helper.wait.newBlocks(3);345 await helper.wait.newBlocks(3);
392392
393 const feeItem = 0;393 const feeItem = 0;
394394
395 await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, {Unlimited: null});395 await helper.xTokens.transferMulticurrencies(bob, currencies, feeItem, destination, 'Unlimited');
396396
397 balanceBobFinal = await helper.balance.getSubstrate(bob.address);397 balanceBobFinal = await helper.balance.getSubstrate(bob.address);
398 console.log('[Opal -> Relay (Westend)] transaction fees: %s OPL', helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));398 console.log('[Opal -> Relay (Westend)] transaction fees: %s OPL', helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
modifiedtests/src/xcm/xcmQuartz.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 balanceQuartzFinal = await helper.balance.getSubstrate(alice.address);316 balanceQuartzFinal = 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('[Quartz -> Relay (Westend)] transaction fees: %s QTZ', helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));431 console.log('[Quartz -> Relay (Westend)] transaction fees: %s QTZ', helper.util.bigIntToDecimals(balanceBobAfter - balanceBobFinal));
533533
534 const feeAssetItem = 0;534 const feeAssetItem = 0;
535535
536 await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, {Unlimited: null});536 await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
537 balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);537 balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccount.address);
538538
539 const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;539 const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;
581 ForeignAsset: 0,581 ForeignAsset: 0,
582 };582 };
583583
584 await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, {Unlimited: null});584 await helper.xTokens.transfer(randomAccount, id, TRANSFER_AMOUNT, destination, 'Unlimited');
585 balanceKaruraTokenFinal = await helper.balance.getSubstrate(randomAccount.address);585 balanceKaruraTokenFinal = await helper.balance.getSubstrate(randomAccount.address);
586 balanceQuartzForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);586 balanceQuartzForeignTokenFinal = await helper.tokens.accounts(randomAccount.address, id);
587587
645 Token: 'KAR',645 Token: 'KAR',
646 };646 };
647647
648 await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, {Unlimited: null});648 await helper.xTokens.transfer(alice, id, 100_000_000_000n, destination, 'Unlimited');
649 });649 });
650650
651 const maxWaitBlocks = 3;651 const maxWaitBlocks = 3;
858 };858 };
859 const amount = TRANSFER_AMOUNT;859 const amount = TRANSFER_AMOUNT;
860860
861 await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, {Unlimited: null});861 await helper.xTokens.transfer(randomAccountQuartz, currencyId, amount, dest, 'Unlimited');
862862
863 balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccountQuartz.address);863 balanceQuartzTokenMiddle = await helper.balance.getSubstrate(randomAccountQuartz.address);
864 expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;864 expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;
912 },912 },
913 };913 };
914914
915 await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, {Unlimited: null});915 await helper.xTokens.transferMultiasset(randomAccountMoonriver, asset, destination, 'Unlimited');
916916
917 balanceMovrTokenFinal = await helper.balance.getEthereum(randomAccountMoonriver.address);917 balanceMovrTokenFinal = await helper.balance.getEthereum(randomAccountMoonriver.address);
918918
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;