difftreelog
test run eslint --fix
in: master
20 files changed
tests/src/benchmarks/mintFee/index.tsdiffbeforeafterboth--- a/tests/src/benchmarks/mintFee/index.ts
+++ b/tests/src/benchmarks/mintFee/index.ts
@@ -222,9 +222,7 @@
await collection.mintToken(
donor,
{Substrate: susbstrateReceiver.address},
- PROPERTIES.slice(0, setup.propertiesNumber).map((p) => {
- return {key: p.key, value: Buffer.from(p.value).toString()};
- }),
+ PROPERTIES.slice(0, setup.propertiesNumber).map((p) => ({key: p.key, value: Buffer.from(p.value).toString()})),
);
},
);
tests/src/benchmarks/opsFee/index.tsdiffbeforeafterboth1import {EthUniqueHelper, usingEthPlaygrounds} from '../../eth/util';2import {readFile} from 'fs/promises';3import {CollectionLimitField, TokenPermissionField} from '../../eth/util/playgrounds/types';4import {IKeyringPair} from '@polkadot/types/types';5import {UniqueFTCollection, UniqueNFTCollection} from '../../util/playgrounds/unique';6import {Contract} from 'web3-eth-contract';7import {createObjectCsvWriter} from 'csv-writer';8import {FunctionFeeVM, IFunctionFee} from '../utils/types';9import {convertToTokens, createCollectionForBenchmarks, PERMISSIONS, PROPERTIES, SUBS_PROPERTIES} from '../utils/common';10import {makeNames} from '../../util';111213const {dirname} = makeNames(import.meta.url);1415const main = async () => {1617 const headers = [18 'function',19 'ethFee',20 'ethGas',21 'substrate',22 'zeppelinFee',23 'zeppelinGas',24 ];2526 const csvWriter20 = createObjectCsvWriter({27 path: 'erc20.csv',28 header: headers,29 });3031 const csvWriter721 = createObjectCsvWriter({32 path: 'erc721.csv',33 header: headers,34 });3536 await usingEthPlaygrounds(async (helper, privateKey) => {37 console.log('\n ERC20 ops fees');38 const erc20 = FunctionFeeVM.fromModel(await erc20CalculateFeeGas(helper, privateKey));39 console.table(erc20);40 await csvWriter20.writeRecords(FunctionFeeVM.toCsv(erc20));4142 console.log('\n ERC721 ops fees');43 const erc721 = FunctionFeeVM.fromModel(await erc721CalculateFeeGas(helper, privateKey));44 console.table(erc721);4546 await csvWriter721.writeRecords(FunctionFeeVM.toCsv(erc721));47 });48};4950main()51 .then(() => process.exit(0))52 .catch((e) => {53 console.log(e);54 process.exit(1);55 });5657async function erc721CalculateFeeGas(58 helper: EthUniqueHelper,59 privateKey: (seed: string) => Promise<IKeyringPair>,60): Promise<IFunctionFee> {61 const res: IFunctionFee = {};62 const donor = await privateKey('//Alice');63 const [subReceiver] = await helper.arrange.createAccounts([10n], donor);64 const ethSigner = await helper.eth.createAccountWithBalance(donor);65 const ethReceiver = await helper.eth.createAccountWithBalance(donor);66 const crossSigner = helper.ethCrossAccount.fromAddress(ethSigner);67 const crossReceiver = helper.ethCrossAccount.fromAddress(ethReceiver);68 const collection = (await createCollectionForBenchmarks(69 'nft',70 helper,71 privateKey,72 ethSigner,73 null,74 PERMISSIONS,75 )) as UniqueNFTCollection;7677 const helperContract = await helper.ethNativeContract.collectionHelpers(ethSigner);78 let zeppelelinContract: Contract | null = null;79 const ZEPPELIN_OBJECT = '0x' + (await readFile(`${dirname}/../utils/openZeppelin/ERC721/bin/ZeppelinContract.bin`)).toString();80 const ZEPPELIN_ABI = JSON.parse((await readFile(`${dirname}/../utils/openZeppelin/ERC721/bin/ZeppelinContract.abi`)).toString());8182 const evmContract = await helper.ethNativeContract.collection(83 helper.ethAddress.fromCollectionId(collection.collectionId),84 'nft',85 ethSigner,86 true,87 );8889 res['createCollection'] = await helper.arrange.calculcateFeeGas(90 {Ethereum: ethSigner},91 () => helperContract.methods.createNFTCollection('test','test','test').send({from: ethSigner, value: Number(2n * helper.balance.getOneTokenNominal())}),92 );9394 res['createCollection'].substrate = convertToTokens((await helper.arrange.calculcateFee(95 {Substrate: donor.address},96 () => helper.nft.mintCollection(97 donor,98 {name: 'test', description: 'test', tokenPrefix: 'test'},99 ),100 )));101102 res['createCollection'].zeppelin = await helper.arrange.calculcateFeeGas(103 {Ethereum: ethSigner},104 async () => {105 zeppelelinContract = await helper.ethContract.deployByAbi(106 ethSigner,107 ZEPPELIN_ABI,108 ZEPPELIN_OBJECT,109 );110 },111 );112113 res['mint'] =114 await helper.arrange.calculcateFeeGas(115 {Ethereum: ethSigner},116 () => evmContract.methods.mint(ethSigner).send(),117 );118119 res['mint'].zeppelin =120 await helper.arrange.calculcateFeeGas(121 {Ethereum: ethSigner},122 () => zeppelelinContract!.methods.safeMint(ethSigner, '').send({from: ethSigner}),123 );124125 res['mintCross'] =126 await helper.arrange.calculcateFeeGas(127 {Ethereum: ethSigner},128 () => evmContract.methods.mintCross(crossSigner, []).send(),129 );130131 res['mint'].substrate = convertToTokens((await helper.arrange.calculcateFee(132 {Substrate: donor.address},133 () => collection.mintToken(134 donor,135 {Substrate: donor.address},136 ),137 )));138139 res['mintCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(140 {Substrate: donor.address},141 () => collection.mintMultipleTokens(donor, [{142 owner: {Substrate: donor.address},143 }]),144 )));145146 res['mintWithTokenURI'] =147 await helper.arrange.calculcateFeeGas(148 {Ethereum: ethSigner},149 () => evmContract.methods.mintWithTokenURI(ethSigner, 'Test URI').send(),150 );151152 res['mintWithTokenURI'].substrate = convertToTokens((await helper.arrange.calculcateFee(153 {Substrate: donor.address},154 () => collection.mintToken(155 donor,156 {Ethereum: ethSigner},157 [{key: 'URI', value: 'Test URI'}],158 ),159 )));160161 res['mintWithTokenURI'].zeppelin =162 await helper.arrange.calculcateFeeGas(163 {Ethereum: ethSigner},164 () => zeppelelinContract!.methods.safeMint(ethSigner, 'Test URI').send({from: ethSigner}),165 );166167 res['setProperties'] =168 await helper.arrange.calculcateFeeGas(169 {Ethereum: ethSigner},170 () => evmContract.methods.setProperties(1, PROPERTIES.slice(0,1)).send(),171 );172173 res['deleteProperties'] =174 await helper.arrange.calculcateFeeGas(175 {Ethereum: ethSigner},176 () => evmContract.methods.deleteProperties(1, [PROPERTIES[0].key]).send(),177 );178179 res['setProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(180 {Substrate: donor.address},181 () => collection.setTokenProperties(182 donor,183 1,184 SUBS_PROPERTIES.slice(0, 1),185 ),186 )));187188 res['deleteProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(189 {Substrate: donor.address},190 () => collection.deleteTokenProperties(191 donor,192 1,193 SUBS_PROPERTIES.slice(0, 1)194 .map(p => p.key),195 ),196 )));197198 res['transfer'] =199 await helper.arrange.calculcateFeeGas(200 {Ethereum: ethSigner},201 () => evmContract.methods.transfer(ethReceiver, 1).send(),202 );203204 res['safeTransferFrom*'] = {205 zeppelin:206 await helper.arrange.calculcateFeeGas(207 {Ethereum: ethSigner},208 () => zeppelelinContract!.methods.safeTransferFrom(ethSigner, ethReceiver, 0).send({from: ethSigner}),209 ),210 };211212 res['transferCross'] =213 await helper.arrange.calculcateFeeGas(214 {Ethereum: ethReceiver},215 () => evmContract.methods.transferCross(crossSigner, 1).send({from: ethReceiver}),216 );217218 res['transferCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(219 {Substrate: donor.address},220 () => collection.transferToken(221 donor,222 3,223 {Substrate: subReceiver.address},224 ),225 )));226 await collection.approveToken(subReceiver, 3, {Substrate: donor.address});227228 res['transferFrom*'] =229 await helper.arrange.calculcateFeeGas(230 {Ethereum: ethSigner},231 () => evmContract.methods.transferFrom(ethSigner, ethReceiver, 1).send(),232 );233234 res['transferFrom*'].zeppelin =235 await helper.arrange.calculcateFeeGas(236 {Ethereum: ethReceiver},237 () => zeppelelinContract!.methods.transferFrom(ethReceiver, ethSigner, 0).send({from: ethReceiver}),238 );239240241 res['transferFromCross'] =242 await helper.arrange.calculcateFeeGas(243 {Ethereum: ethReceiver},244 () => evmContract.methods.transferFromCross(crossReceiver, crossSigner, 1).send({from:ethReceiver}),245 );246247 res['transferFromCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(248 {Substrate: donor.address},249 () => collection.transferTokenFrom(donor, 3, {Substrate: subReceiver.address}, {Substrate: donor.address}),250 )));251252 res['burn'] =253 await helper.arrange.calculcateFeeGas(254 {Ethereum: ethSigner},255 () => evmContract.methods.burn(1).send(),256 );257258 res['burn'].substrate = convertToTokens((await helper.arrange.calculcateFee(259 {Substrate: donor.address},260 () => collection.burnToken(donor, 3),261 )));262263 res['approve*'] =264 await helper.arrange.calculcateFeeGas(265 {Ethereum: ethSigner},266 () => evmContract.methods.approve(ethReceiver, 2).send(),267 );268269 res['approve*'].zeppelin =270 await helper.arrange.calculcateFeeGas(271 {Ethereum: ethSigner},272 () => zeppelelinContract!.methods.approve(ethReceiver, 0).send({from: ethSigner}),273 );274275 res['approveCross'] =276 await helper.arrange.calculcateFeeGas(277 {Ethereum: ethSigner},278 () => evmContract.methods.approveCross(crossReceiver, 2).send(),279 );280281 res['approveCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(282 {Substrate: donor.address},283 () => collection.approveToken(donor, 4, {Substrate: subReceiver.address}),284 )));285286 res['setApprovalForAll*'] =287 await helper.arrange.calculcateFeeGas(288 {Ethereum: ethSigner},289 () => evmContract.methods.setApprovalForAll(ethReceiver, true).send(),290 );291292 res['setApprovalForAll*'].zeppelin =293 await helper.arrange.calculcateFeeGas(294 {Ethereum: ethSigner},295 () => zeppelelinContract!.methods.setApprovalForAll(ethReceiver, true).send({from: ethSigner}),296 );297298 res['setApprovalForAll*'].substrate = convertToTokens((await helper.arrange.calculcateFee(299 {Substrate: donor.address},300 () => helper.nft.setAllowanceForAll(donor, collection.collectionId, {Substrate: subReceiver.address}, true),301 )));302303 res['burnFromCross'] =304 await helper.arrange.calculcateFeeGas(305 {Ethereum: ethReceiver},306 () => evmContract.methods.burnFromCross(crossSigner, 2).send({from:ethReceiver}),307 );308309 res['burnFromCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(310 {Substrate: subReceiver.address},311 () => collection.burnTokenFrom(subReceiver, 4, {Substrate: donor.address}),312 )));313314 res['setTokenPropertyPermissions'] =315 await helper.arrange.calculcateFeeGas(316 {Ethereum: ethSigner},317 () => evmContract.methods.setTokenPropertyPermissions([318 ['url', [319 [TokenPermissionField.Mutable, true],320 [TokenPermissionField.TokenOwner, true],321 [TokenPermissionField.CollectionAdmin, true]],322 ],323 ]).send(),324 );325326 res['setTokenPropertyPermissions'].substrate = convertToTokens((await helper.arrange.calculcateFee(327 {Substrate: donor.address},328 () => collection.setTokenPropertyPermissions(donor, [{key: 'url', permission: {329 tokenOwner: true,330 collectionAdmin: true,331 mutable: true,332 }}]),333 )));334335 res['setCollectionSponsorCross'] =336 await helper.arrange.calculcateFeeGas(337 {Ethereum: ethSigner},338 () => evmContract.methods.setCollectionSponsorCross(crossReceiver).send(),339 );340341 res['confirmCollectionSponsorship'] =342 await helper.arrange.calculcateFeeGas(343 {Ethereum: ethReceiver},344 () => evmContract.methods.confirmCollectionSponsorship().send({from: ethReceiver}),345 );346347 res['removeCollectionSponsor'] =348 await helper.arrange.calculcateFeeGas(349 {Ethereum: ethSigner},350 () => evmContract.methods.removeCollectionSponsor().send(),351 );352353 res['setCollectionSponsorCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(354 {Substrate: donor.address},355 () => collection.setSponsor(donor, subReceiver.address),356 )));357358 res['confirmCollectionSponsorship'].substrate = convertToTokens((await helper.arrange.calculcateFee(359 {Substrate: subReceiver.address},360 () => collection.confirmSponsorship(subReceiver),361 )));362363 res['removeCollectionSponsor'].substrate = convertToTokens((await helper.arrange.calculcateFee(364 {Substrate: donor.address},365 () => collection.removeSponsor(donor),366 )));367368 res['setCollectionProperties'] =369 await helper.arrange.calculcateFeeGas(370 {Ethereum: ethSigner},371 () => evmContract.methods.setCollectionProperties(PROPERTIES.slice(0, 1)).send(),372 );373374 res['deleteCollectionProperties'] =375 await helper.arrange.calculcateFeeGas(376 {Ethereum: ethSigner},377 () => evmContract.methods.deleteCollectionProperties(PROPERTIES.slice(0,1).map(p => p.key)).send(),378 );379 res['setCollectionProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(380 {Substrate: donor.address},381 () => collection.setProperties(donor, PROPERTIES.slice(0, 1)382 .map(p => { return {key: p.key, value: p.value.toString()}; })),383 )));384385 res['deleteCollectionProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(386 {Substrate: donor.address},387 () => collection.deleteProperties(donor, PROPERTIES.slice(0, 1)388 .map(p => p.key)),389 )));390391 res['setCollectionLimit'] =392 await helper.arrange.calculcateFeeGas(393 {Ethereum: ethSigner},394 () => evmContract.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}}).send(),395 );396397 res['setCollectionLimit'].substrate = convertToTokens((await helper.arrange.calculcateFee(398 {Substrate: donor.address},399 () => collection.setLimits(donor, {accountTokenOwnershipLimit: 1000}),400 )));401402 const {collectionAddress} = await helper.eth.createCollection('nft', ethSigner, 'A', 'B', 'C');403 const collectionWithEthOwner = await helper.ethNativeContract.collection(collectionAddress, 'nft', ethSigner, true);404405406 res['addCollectionAdminCross'] =407 await helper.arrange.calculcateFeeGas(408 {Ethereum: ethSigner},409 () => collectionWithEthOwner.methods.addCollectionAdminCross(crossReceiver).send(),410 );411412 res['removeCollectionAdminCross'] =413 await helper.arrange.calculcateFeeGas(414 {Ethereum: ethSigner},415 () => collectionWithEthOwner.methods.removeCollectionAdminCross(crossReceiver).send(),416 );417418 res['addCollectionAdminCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(419 {Substrate: donor.address},420 () => collection.addAdmin(donor, {Ethereum: ethReceiver}),421 )));422423 res['removeCollectionAdminCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(424 {Substrate: donor.address},425 () => collection.removeAdmin(donor, {Ethereum: ethReceiver}),426 )));427428 res['setCollectionNesting'] =429 await helper.arrange.calculcateFeeGas(430 {Ethereum: ethSigner},431 () => evmContract.methods.setCollectionNesting(true).send(),432 );433434 res['setCollectionNesting[]'] =435 await helper.arrange.calculcateFeeGas(436 {Ethereum: ethSigner},437 () => evmContract.methods.setCollectionNesting(true, [collectionAddress]).send(),438 );439440 res['setCollectionNesting'].substrate = convertToTokens((await helper.arrange.calculcateFee(441 {Substrate: donor.address},442 () => collection.disableNesting(donor),443 )));444445 res['setCollectionNesting[]'].substrate = convertToTokens((await helper.arrange.calculcateFee(446 {Substrate: donor.address},447 () => collection.setPermissions(448 donor,449 {450 nesting: {451 tokenOwner: true,452 restricted: [collection.collectionId],453 },454 },455 ),456 )));457458 res['setCollectionAccess'] =459 await helper.arrange.calculcateFeeGas(460 {Ethereum: ethSigner},461 () => evmContract.methods.setCollectionAccess(1).send(),462 );463464 res['setCollectionAccess'].substrate = convertToTokens((await helper.arrange.calculcateFee(465 {Substrate: donor.address},466 () => collection.setPermissions(donor, {access: 'AllowList'}),467 )));468469 res['addToCollectionAllowListCross'] =470 await helper.arrange.calculcateFeeGas(471 {Ethereum: ethSigner},472 () => evmContract.methods.addToCollectionAllowListCross(crossReceiver).send(),473 );474475 res['removeFromCollectionAllowListCross'] =476 await helper.arrange.calculcateFeeGas(477 {Ethereum: ethSigner},478 () => evmContract.methods.removeFromCollectionAllowListCross(crossReceiver).send(),479 );480481 res['addToCollectionAllowListCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(482 {Substrate: donor.address},483 () => collection.addToAllowList(donor, {Ethereum: ethReceiver}),484 )));485486 res['removeFromCollectionAllowListCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(487 {Substrate: donor.address},488 () => collection.removeFromAllowList(donor, {Ethereum: ethReceiver}),489 )));490491 res['setCollectionMintMode'] =492 await helper.arrange.calculcateFeeGas(493 {Ethereum: ethSigner},494 () => evmContract.methods.setCollectionMintMode(true).send(),495 );496497 res['setCollectionMintMode'].substrate = convertToTokens((await helper.arrange.calculcateFee(498 {Substrate: donor.address},499 () => collection.setPermissions(donor, {mintMode: false}),500 )));501502 res['changeCollectionOwnerCross'] =503 await helper.arrange.calculcateFeeGas(504 {Ethereum: ethSigner},505 () => collectionWithEthOwner.methods.changeCollectionOwnerCross(crossReceiver).send(),506 );507508 res['changeCollectionOwnerCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(509 {Substrate: donor.address},510 () => collection.changeOwner(donor, subReceiver.address),511 )));512513 return res;514}515516async function erc20CalculateFeeGas(517 helper: EthUniqueHelper,518 privateKey: (seed: string) => Promise<IKeyringPair>,519520): Promise<IFunctionFee> {521 const res: IFunctionFee = {};522 const donor = await privateKey('//Alice');523 const [subReceiver] = await helper.arrange.createAccounts([10n], donor);524 const ethSigner = await helper.eth.createAccountWithBalance(donor);525 const ethReceiver = await helper.eth.createAccountWithBalance(donor);526 const crossSigner = helper.ethCrossAccount.fromAddress(ethSigner);527 const crossReceiver = helper.ethCrossAccount.fromAddress(ethReceiver);528 const collection = (await createCollectionForBenchmarks(529 'ft',530 helper,531 privateKey,532 ethSigner,533 null,534 PERMISSIONS,535 )) as UniqueFTCollection;536537 const helperContract = await helper.ethNativeContract.collectionHelpers(ethSigner);538 let zeppelelinContract: Contract | null = null;539 const ZEPPELIN_OBJECT = '0x' + (await readFile(`${dirname}/../utils/openZeppelin/ERC20/bin/ZeppelinContract.bin`)).toString();540 const ZEPPELIN_ABI = JSON.parse((await readFile(`${dirname}/../utils/openZeppelin/ERC20/bin/ZeppelinContract.abi`)).toString());541542 const evmContract = await helper.ethNativeContract.collection(543 helper.ethAddress.fromCollectionId(collection.collectionId),544 'ft',545 ethSigner,546 true,547 );548549 res['createCollection'] = await helper.arrange.calculcateFeeGas(550 {Ethereum: ethSigner},551 () => helperContract.methods.createFTCollection('test', 18,'test','test').send({from: ethSigner, value: Number(2n * helper.balance.getOneTokenNominal())}),552 );553554 res['createCollection'].substrate = convertToTokens((await helper.arrange.calculcateFee(555 {Substrate: donor.address},556 () => helper.ft.mintCollection(557 donor,558 {name: 'test', description: 'test', tokenPrefix: 'test'},559 18,560 ),561 )));562563 res['createCollection'].zeppelin = await helper.arrange.calculcateFeeGas(564 {Ethereum: ethSigner},565 async () => {566 zeppelelinContract = await helper.ethContract.deployByAbi(567 ethSigner,568 ZEPPELIN_ABI,569 ZEPPELIN_OBJECT,570 );571 },572 );573574 res['mint'] =575 await helper.arrange.calculcateFeeGas(576 {Ethereum: ethSigner},577 () => evmContract.methods.mint(ethSigner, 1).send(),578 );579580 res['mint'].zeppelin =581 await helper.arrange.calculcateFeeGas(582 {Ethereum: ethSigner},583 () => zeppelelinContract!.methods.mint(ethSigner, 1).send(),584 );585586 res['mintCross'] =587 await helper.arrange.calculcateFeeGas(588 {Ethereum: ethSigner},589 () => evmContract.methods.mintCross(crossSigner, 1).send(),590 );591592 res['mintCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(593 {Substrate: donor.address},594 () => collection.mint(595 donor,596 10n,597 {Substrate: donor.address},598 ),599 )));600601 res['mintBulk'] =602 await helper.arrange.calculcateFeeGas(603 {Ethereum: ethSigner},604 () => evmContract.methods.mintBulk([{to: ethSigner, amount: 1}]).send(),605 );606607 res['mintBulk'].substrate = convertToTokens((await helper.arrange.calculcateFee(608 {Substrate: donor.address},609 () => helper.executeExtrinsic(donor, 'api.tx.unique.createMultipleItemsEx',[collection.collectionId, {610 Fungible: new Map([611 [JSON.stringify({Ethereum: ethSigner}), 1],612 ]),613 }], true),614 )));615616 res['transfer*'] =617 await helper.arrange.calculcateFeeGas(618 {Ethereum: ethSigner},619 () => evmContract.methods.transfer(ethReceiver, 1).send(),620 );621622 res['transfer*'].zeppelin =623 await helper.arrange.calculcateFeeGas(624 {Ethereum: ethSigner},625 () => zeppelelinContract!.methods.transfer(ethReceiver, 1).send(),626 );627628 res['transferCross'] =629 await helper.arrange.calculcateFeeGas(630 {Ethereum: ethReceiver},631 () => evmContract.methods.transferCross(crossSigner, 1).send({from: ethReceiver}),632 );633634 res['transferCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(635 {Substrate: donor.address},636 () => collection.transfer(637 donor,638 {Substrate: subReceiver.address},639 1n,640 ),641 )));642 await collection.approveTokens(subReceiver, {Substrate: donor.address}, 1n);643644 res['transferFrom*'] =645 await helper.arrange.calculcateFeeGas(646 {Ethereum: ethSigner},647 () => evmContract.methods.transferFrom(ethSigner, ethReceiver, 1).send(),648 );649650 await zeppelelinContract!.methods.approve(ethSigner, 10).send({from: ethReceiver});651652 res['transferFrom*'].zeppelin =653 await helper.arrange.calculcateFeeGas(654 {Ethereum: ethSigner},655 () => zeppelelinContract!.methods.transferFrom(ethReceiver, ethSigner, 1).send({from: ethSigner}),656 );657658 res['transferFromCross'] =659 await helper.arrange.calculcateFeeGas(660 {Ethereum: ethReceiver},661 () => evmContract.methods.transferFromCross(crossReceiver, crossSigner, 1).send({from:ethReceiver}),662 );663664 res['transferFromCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(665 {Substrate: donor.address},666 () => collection.transferFrom(donor, {Substrate: subReceiver.address}, {Substrate: donor.address}, 1n),667 )));668669670 res['burnTokens'] = {fee: 0n, gas: 0n};671 res['burnTokens'].substrate = convertToTokens((await helper.arrange.calculcateFee(672 {Substrate: donor.address},673 () => collection.burnTokens(donor, 1n),674 )));675676677 res['approve*'] =678 await helper.arrange.calculcateFeeGas(679 {Ethereum: ethSigner},680 () => evmContract.methods.approve(ethReceiver, 2).send(),681 );682683 res['approve*'].zeppelin =684 await helper.arrange.calculcateFeeGas(685 {Ethereum: ethSigner},686 () => zeppelelinContract!.methods.approve(ethReceiver, 10).send(),687 );688689 res['approveCross'] =690 await helper.arrange.calculcateFeeGas(691 {Ethereum: ethSigner},692 () => evmContract.methods.approveCross(crossReceiver, 2).send(),693 );694695 res['approveCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(696 {Substrate: donor.address},697 () => collection.approveTokens(donor, {Substrate: subReceiver.address}, 1n),698 )));699700 res['burnFromCross'] =701 await helper.arrange.calculcateFeeGas(702 {Ethereum: ethReceiver},703 () => evmContract.methods.burnFromCross(crossSigner, 1).send({from:ethReceiver}),704 );705706 res['burnFromCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(707 {Substrate: subReceiver.address},708 () => collection.burnTokensFrom(subReceiver, {Substrate: donor.address}, 1n),709 )));710711 res['setCollectionSponsorCross'] =712 await helper.arrange.calculcateFeeGas(713 {Ethereum: ethSigner},714 () => evmContract.methods.setCollectionSponsorCross(crossReceiver).send(),715 );716717 res['confirmCollectionSponsorship'] =718 await helper.arrange.calculcateFeeGas(719 {Ethereum: ethReceiver},720 () => evmContract.methods.confirmCollectionSponsorship().send({from: ethReceiver}),721 );722723 res['removeCollectionSponsor'] =724 await helper.arrange.calculcateFeeGas(725 {Ethereum: ethSigner},726 () => evmContract.methods.removeCollectionSponsor().send(),727 );728729 res['setCollectionSponsorCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(730 {Substrate: donor.address},731 () => collection.setSponsor(donor, subReceiver.address),732 )));733734 res['confirmCollectionSponsorship'].substrate = convertToTokens((await helper.arrange.calculcateFee(735 {Substrate: subReceiver.address},736 () => collection.confirmSponsorship(subReceiver),737 )));738739 res['removeCollectionSponsor'].substrate = convertToTokens((await helper.arrange.calculcateFee(740 {Substrate: donor.address},741 () => collection.removeSponsor(donor),742 )));743744 res['setCollectionProperties'] =745 await helper.arrange.calculcateFeeGas(746 {Ethereum: ethSigner},747 () => evmContract.methods.setCollectionProperties(PROPERTIES.slice(0, 1)).send(),748 );749750 res['deleteCollectionProperties'] =751 await helper.arrange.calculcateFeeGas(752 {Ethereum: ethSigner},753 () => evmContract.methods.deleteCollectionProperties(PROPERTIES.slice(0,1).map(p => p.key)).send(),754 );755 res['setCollectionProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(756 {Substrate: donor.address},757 () => collection.setProperties(donor, PROPERTIES.slice(0, 1)758 .map(p => { return {key: p.key, value: p.value.toString()}; })),759 )));760761 res['deleteCollectionProperties'].substrate = convertToTokens((await helper.arrange.calculcateFee(762 {Substrate: donor.address},763 () => collection.deleteProperties(donor, PROPERTIES.slice(0, 1)764 .map(p => p.key)),765 )));766767 res['setCollectionLimit'] =768 await helper.arrange.calculcateFeeGas(769 {Ethereum: ethSigner},770 () => evmContract.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, value: {status: true, value: 1000}}).send(),771 );772773 res['setCollectionLimit'].substrate = convertToTokens((await helper.arrange.calculcateFee(774 {Substrate: donor.address},775 () => collection.setLimits(donor, {accountTokenOwnershipLimit: 1000}),776 )));777778 const {collectionAddress} = await helper.eth.createCollection('nft', ethSigner, 'A', 'B', 'C');779 const collectionWithEthOwner = await helper.ethNativeContract.collection(collectionAddress, 'nft', ethSigner, true);780781782 res['addCollectionAdminCross'] =783 await helper.arrange.calculcateFeeGas(784 {Ethereum: ethSigner},785 () => collectionWithEthOwner.methods.addCollectionAdminCross(crossReceiver).send(),786 );787788 res['removeCollectionAdminCross'] =789 await helper.arrange.calculcateFeeGas(790 {Ethereum: ethSigner},791 () => collectionWithEthOwner.methods.removeCollectionAdminCross(crossReceiver).send(),792 );793794 res['addCollectionAdminCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(795 {Substrate: donor.address},796 () => collection.addAdmin(donor, {Ethereum: ethReceiver}),797 )));798799 res['removeCollectionAdminCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(800 {Substrate: donor.address},801 () => collection.removeAdmin(donor, {Ethereum: ethReceiver}),802 )));803804 res['setCollectionNesting'] =805 await helper.arrange.calculcateFeeGas(806 {Ethereum: ethSigner},807 () => evmContract.methods.setCollectionNesting(true).send(),808 );809810 res['setCollectionNesting[]'] =811 await helper.arrange.calculcateFeeGas(812 {Ethereum: ethSigner},813 () => evmContract.methods.setCollectionNesting(true, [collectionAddress]).send(),814 );815816 res['setCollectionNesting'].substrate = convertToTokens((await helper.arrange.calculcateFee(817 {Substrate: donor.address},818 () => collection.disableNesting(donor),819 )));820821 res['setCollectionNesting[]'].substrate = convertToTokens((await helper.arrange.calculcateFee(822 {Substrate: donor.address},823 () => collection.setPermissions(824 donor,825 {826 nesting: {827 tokenOwner: true,828 restricted: [collection.collectionId],829 },830 },831 ),832 )));833834 res['setCollectionAccess'] =835 await helper.arrange.calculcateFeeGas(836 {Ethereum: ethSigner},837 () => evmContract.methods.setCollectionAccess(1).send(),838 );839840 res['setCollectionAccess'].substrate = convertToTokens((await helper.arrange.calculcateFee(841 {Substrate: donor.address},842 () => collection.setPermissions(donor, {access: 'AllowList'}),843 )));844845 res['addToCollectionAllowListCross'] =846 await helper.arrange.calculcateFeeGas(847 {Ethereum: ethSigner},848 () => evmContract.methods.addToCollectionAllowListCross(crossReceiver).send(),849 );850851 res['removeFromCollectionAllowListCross'] =852 await helper.arrange.calculcateFeeGas(853 {Ethereum: ethSigner},854 () => evmContract.methods.removeFromCollectionAllowListCross(crossReceiver).send(),855 );856857 res['addToCollectionAllowListCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(858 {Substrate: donor.address},859 () => collection.addToAllowList(donor, {Ethereum: ethReceiver}),860 )));861862 res['removeFromCollectionAllowListCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(863 {Substrate: donor.address},864 () => collection.removeFromAllowList(donor, {Ethereum: ethReceiver}),865 )));866867 res['setCollectionMintMode'] =868 await helper.arrange.calculcateFeeGas(869 {Ethereum: ethSigner},870 () => evmContract.methods.setCollectionMintMode(true).send(),871 );872873 res['setCollectionMintMode'].substrate = convertToTokens((await helper.arrange.calculcateFee(874 {Substrate: donor.address},875 () => collection.setPermissions(donor, {mintMode: false}),876 )));877878 res['changeCollectionOwnerCross'] =879 await helper.arrange.calculcateFeeGas(880 {Ethereum: ethSigner},881 () => collectionWithEthOwner.methods.changeCollectionOwnerCross(crossReceiver).send(),882 );883884 res['changeCollectionOwnerCross'].substrate = convertToTokens((await helper.arrange.calculcateFee(885 {Substrate: donor.address},886 () => collection.changeOwner(donor, subReceiver.address),887 )));888889 return res;890}tests/src/benchmarks/utils/common.tsdiffbeforeafterboth--- a/tests/src/benchmarks/utils/common.ts
+++ b/tests/src/benchmarks/utils/common.ts
@@ -5,32 +5,26 @@
export const PROPERTIES = Array(40)
.fill(0)
- .map((_, i) => {
- return {
- key: `key_${i}`,
- value: Uint8Array.from(Buffer.from(`value_${i}`)),
- };
- });
+ .map((_, i) => ({
+ key: `key_${i}`,
+ value: Uint8Array.from(Buffer.from(`value_${i}`)),
+ }));
export const SUBS_PROPERTIES = Array(40)
.fill(0)
- .map((_, i) => {
- return {
- key: `key_${i}`,
- value: `value_${i}`,
- };
- });
+ .map((_, i) => ({
+ key: `key_${i}`,
+ value: `value_${i}`,
+ }));
-export const PERMISSIONS: ITokenPropertyPermission[] = PROPERTIES.map((p) => {
- return {
- key: p.key,
- permission: {
- tokenOwner: true,
- collectionAdmin: true,
- mutable: true,
- },
- };
-});
+export const PERMISSIONS: ITokenPropertyPermission[] = PROPERTIES.map((p) => ({
+ key: p.key,
+ permission: {
+ tokenOwner: true,
+ collectionAdmin: true,
+ mutable: true,
+ },
+}));
export function convertToTokens(value: bigint, nominal = 1000_000_000_000_000_000n): number {
return Number((value * 1000n) / nominal) / 1000;
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -76,9 +76,7 @@
// 2. Expect methods.collectionAdmins == api.rpc.unique.adminlist
let adminListEth = await collectionEvm.methods.collectionAdmins().call();
- adminListEth = adminListEth.map((element: IEthCrossAccountId) => {
- return helper.address.convertCrossAccountFromEthCrossAccount(element);
- });
+ adminListEth = adminListEth.map((element: IEthCrossAccountId) => helper.address.convertCrossAccountFromEthCrossAccount(element));
expect(adminListRpc).to.be.like(adminListEth);
// 3. check isOwnerOrAdminCross returns true:
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -181,17 +181,11 @@
const propertyPermissions = data2?.raw.tokenPropertyPermissions;
expect(propertyPermissions?.length).to.equal(2);
- expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
- return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
- })).to.be.not.null;
+ expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner)).to.be.not.null;
- expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
- return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
- })).to.be.not.null;
+ expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner)).to.be.not.null;
- expect(data2?.raw.properties?.find((property: IProperty) => {
- return property.key === 'baseURI' && property.value === BASE_URI;
- })).to.be.not.null;
+ expect(data2?.raw.properties?.find((property: IProperty) => property.key === 'baseURI' && property.value === BASE_URI)).to.be.not.null;
const token1Result = await contract.methods.mint(bruh).send();
const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;
tests/src/eth/evmCoder.test.tsdiffbeforeafterboth--- a/tests/src/eth/evmCoder.test.ts
+++ b/tests/src/eth/evmCoder.test.ts
@@ -17,8 +17,7 @@
import {IKeyringPair} from '@polkadot/types/types';
import {itEth, expect, usingEthPlaygrounds} from './util';
-const getContractSource = (collectionAddress: string, contractAddress: string): string => {
- return `
+const getContractSource = (collectionAddress: string, contractAddress: string): string => `
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
interface ITest {
@@ -51,7 +50,6 @@
}
}
`;
-};
describe('Evm Coder tests', () => {
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -102,17 +102,15 @@
const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(receiverSub);
// const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
- const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+ const properties = Array(5).fill(0).map((_, i) => ({key: `key_${i}`, value: Buffer.from(`value_${i}`)}));
const permissions: ITokenPropertyPermission[] = properties
- .map(p => {
- return {
- key: p.key, permission: {
- tokenOwner: false,
- collectionAdmin: true,
- mutable: false,
- },
- };
- });
+ .map(p => ({
+ key: p.key, permission: {
+ tokenOwner: false,
+ collectionAdmin: true,
+ mutable: false,
+ },
+ }));
const collection = await helper.nft.mintCollection(minter, {
tokenPrefix: 'ethp',
@@ -146,7 +144,7 @@
expect(tokenId).to.be.equal(expectedTokenId);
expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
- .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ .map(p => helper.ethProperty.property(p.key, p.value.toString())));
expect(await helper.nft.getTokenOwner(collection.collectionId, tokenId))
.to.deep.eq(testCase === 'ethereum' ? {Ethereum: receiverEth.toLowerCase()} : {Substrate: receiverSub.address});
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -46,12 +46,11 @@
const receiverSub = bob;
const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(receiverSub);
- const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
- const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {
+ const properties = Array(5).fill(0).map((_, i) => ({key: `key_${i}`, value: Buffer.from(`value_${i}`)}));
+ const permissions: ITokenPropertyPermission[] = properties.map(p => ({key: p.key, permission: {
tokenOwner: false,
collectionAdmin: true,
- mutable: false}};
- });
+ mutable: false}}));
const collection = await helper.rft.mintCollection(minter, {
@@ -86,7 +85,7 @@
expect(tokenId).to.be.equal(expectedTokenId);
expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
- .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ .map(p => helper.ethProperty.property(p.key, p.value.toString())));
expect(await helper.nft.getTokenOwner(collection.collectionId, tokenId))
.to.deep.eq(testCase === 'ethereum' ? {Ethereum: receiverEth.toLowerCase()} : {Substrate: receiverSub.address});
tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -241,10 +241,10 @@
itEth.ifWithPallets(`Can be multiple set/read for ${testCase.mode}`, testCase.requiredPallets, async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
- const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
- const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
+ const properties = Array(5).fill(0).map((_, i) => ({key: `key_${i}`, value: Buffer.from(`value_${i}`)}));
+ const permissions: ITokenPropertyPermission[] = properties.map(p => ({key: p.key, permission: {tokenOwner: true,
collectionAdmin: true,
- mutable: true}}; });
+ mutable: true}}));
const collection = await helper[testCase.mode].mintCollection(alice, {
tokenPrefix: 'ethp',
@@ -267,10 +267,10 @@
await contract.methods.setProperties(token.tokenId, properties).send({from: caller});
const values = await token.getProperties(properties.map(p => p.key));
- expect(values).to.be.deep.equal(properties.map(p => { return {key: p.key, value: p.value.toString()}; }));
+ expect(values).to.be.deep.equal(properties.map(p => ({key: p.key, value: p.value.toString()})));
expect(await contract.methods.properties(token.tokenId, []).call()).to.be.like(properties
- .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ .map(p => helper.ethProperty.property(p.key, p.value.toString())));
expect(await contract.methods.properties(token.tokenId, [properties[0].key]).call())
.to.be.like([helper.ethProperty.property(properties[0].key, properties[0].value.toString())]);
tests/src/fungible.test.tsdiffbeforeafterboth--- a/tests/src/fungible.test.ts
+++ b/tests/src/fungible.test.ts
@@ -46,7 +46,7 @@
itSub('RPC method tokenOnewrs for fungible collection and token', async ({helper}) => {
const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
- const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => {return {Substrate: keyring.address};});
+ const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => ({Substrate: keyring.address}));
const collection = await helper.ft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
tests/src/getPropertiesRpc.test.tsdiffbeforeafterboth--- a/tests/src/getPropertiesRpc.test.ts
+++ b/tests/src/getPropertiesRpc.test.ts
@@ -48,17 +48,13 @@
describe('query properties RPC', () => {
let alice: IKeyringPair;
- const mintCollection = async (helper: UniqueHelper) => {
- return await helper.nft.mintCollection(alice, {
- tokenPrefix: 'prps',
- properties: collectionProps,
- tokenPropertyPermissions: tokenPropPermissions,
- });
- };
+ const mintCollection = async (helper: UniqueHelper) => await helper.nft.mintCollection(alice, {
+ tokenPrefix: 'prps',
+ properties: collectionProps,
+ tokenPropertyPermissions: tokenPropPermissions,
+ });
- const mintToken = async (collection: UniqueNFTCollection) => {
- return await collection.mintToken(alice, {Substrate: alice.address}, tokenProps);
- };
+ const mintToken = async (collection: UniqueNFTCollection) => await collection.mintToken(alice, {Substrate: alice.address}, tokenProps);
before(async () => {
tests/src/nesting/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/nesting/tokenProperties.test.ts
+++ b/tests/src/nesting/tokenProperties.test.ts
@@ -44,7 +44,7 @@
async function mintCollectionWithAllPermissionsAndToken(helper: UniqueHelper, mode: 'NFT' | 'RFT'): Promise<[UniqueNFToken | UniqueRFToken, bigint]> {
const collection = await (mode == 'NFT' ? helper.nft : helper.rft).mintCollection(alice, {
tokenPropertyPermissions: permissions.flatMap(({permission, signers}, i) =>
- signers.map(signer => {return {key: `${i+1}_${signer.address}`, permission};})),
+ signers.map(signer => ({key: `${i+1}_${signer.address}`, permission}))),
});
return mode == 'NFT' ? [await collection.mintToken(alice), 1n] : [await collection.mintToken(alice, 100n as any), 100n];
}
@@ -201,7 +201,7 @@
const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});
const collectionB = await helper.nft.mintCollection(alice, {
tokenPropertyPermissions: permissions.flatMap(({permission, signers}, i) =>
- signers.map(signer => {return {key: `${i+1}_${signer.address}`, permission};})),
+ signers.map(signer => ({key: `${i+1}_${signer.address}`, permission}))),
});
const targetToken = await collectionA.mintToken(alice);
const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());
@@ -239,7 +239,7 @@
const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});
const collectionB = await helper.nft.mintCollection(alice, {
tokenPropertyPermissions: permissions.flatMap(({permission, signers}, i) =>
- signers.map(signer => {return {key: `${i+1}_${signer.address}`, permission};})),
+ signers.map(signer => ({key: `${i+1}_${signer.address}`, permission}))),
});
const targetToken = await collectionA.mintToken(alice);
const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());
@@ -284,7 +284,7 @@
const collectionA = await helper.nft.mintCollection(alice, {permissions: {nesting: {tokenOwner: true}}});
const collectionB = await helper.nft.mintCollection(alice, {
tokenPropertyPermissions: permissions.flatMap(({permission, signers}, i) =>
- signers.map(signer => {return {key: `${i+1}_${signer.address}`, permission};})),
+ signers.map(signer => ({key: `${i+1}_${signer.address}`, permission}))),
});
const targetToken = await collectionA.mintToken(alice);
const nestedToken = await collectionB.mintToken(alice, targetToken.nestingAccount());
@@ -477,7 +477,7 @@
async function mintCollectionWithAllPermissionsAndToken(helper: UniqueHelper, mode: 'NFT' | 'RFT'): Promise<[UniqueNFToken | UniqueRFToken, bigint]> {
const collection = await (mode == 'NFT' ? helper.nft : helper.rft).mintCollection(alice, {
- tokenPropertyPermissions: constitution.map(({permission}, i) => {return {key: `${i+1}`, permission};}),
+ tokenPropertyPermissions: constitution.map(({permission}, i) => ({key: `${i+1}`, permission})),
});
return mode == 'NFT' ? [await collection.mintToken(alice), 1n] : [await collection.mintToken(alice, 100n as any), 100n];
}
tests/src/refungible.test.tsdiffbeforeafterboth--- a/tests/src/refungible.test.ts
+++ b/tests/src/refungible.test.ts
@@ -64,7 +64,7 @@
itSub('RPC method tokenOwners for refungible collection and token', async ({helper}) => {
const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
- const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => {return {Substrate: keyring.address};});
+ const facelessCrowd = (await helper.arrange.createAccounts(Array(7).fill(0n), donor)).map(keyring => ({Substrate: keyring.address}));
const collection = await helper.rft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});
tests/src/rpc.test.tsdiffbeforeafterboth--- a/tests/src/rpc.test.ts
+++ b/tests/src/rpc.test.ts
@@ -40,7 +40,7 @@
// Set-up a few token owners of all stripes
const ethAcc = {Ethereum: '0x67fb3503a61b284dc83fa96dceec4192db47dc7c'};
const facelessCrowd = (await helper.arrange.createAccounts([0n, 0n, 0n, 0n, 0n, 0n, 0n], donor))
- .map(i => {return {Substrate: i.address};});
+ .map(i => ({Substrate: i.address}));
const collection = await helper.ft.mintCollection(alice, {name: 'RPC-2', tokenPrefix: 'RPC'});
// mint some maximum (u128) amounts of tokens possible
tests/src/sub/appPromotion/appPromotion.test.tsdiffbeforeafterboth--- a/tests/src/sub/appPromotion/appPromotion.test.ts
+++ b/tests/src/sub/appPromotion/appPromotion.test.ts
@@ -357,11 +357,9 @@
const stakers = await getAccounts(3);
await Promise.all(stakers.map(staker => helper.staking.stake(staker, 100n * nominal)));
- await Promise.all(stakers.map(staker => {
- return testCase.method === 'unstakeAll'
- ? helper.staking.unstakeAll(staker)
- : helper.staking.unstakePartial(staker, 100n * nominal);
- }));
+ await Promise.all(stakers.map(staker => testCase.method === 'unstakeAll'
+ ? helper.staking.unstakeAll(staker)
+ : helper.staking.unstakePartial(staker, 100n * nominal)));
await Promise.all(stakers.map(async (staker) => {
expect(await helper.staking.getPendingUnstake({Substrate: staker.address})).to.be.equal(100n * nominal);
@@ -375,11 +373,9 @@
const stakers = await getAccounts(10);
await Promise.all(stakers.map(staker => helper.staking.stake(staker, 100n * nominal)));
- const unstakingResults = await Promise.allSettled(stakers.map((staker, i) => {
- return i % 2 === 0
- ? helper.staking.unstakeAll(staker)
- : helper.staking.unstakePartial(staker, 100n * nominal);
- }));
+ const unstakingResults = await Promise.allSettled(stakers.map((staker, i) => i % 2 === 0
+ ? helper.staking.unstakeAll(staker)
+ : helper.staking.unstakePartial(staker, 100n * nominal)));
const successfulUnstakes = unstakingResults.filter(result => result.status === 'fulfilled');
expect(successfulUnstakes).to.have.length(3);
tests/src/util/index.tsdiffbeforeafterboth--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -19,13 +19,9 @@
chai.use(chaiSubset);
export const expect = chai.expect;
-const getTestHash = (filename: string) => {
- return crypto.createHash('md5').update(filename).digest('hex');
-};
+const getTestHash = (filename: string) => crypto.createHash('md5').update(filename).digest('hex');
-export const getTestSeed = (filename: string) => {
- return `//Alice+${getTestHash(filename)}`;
-};
+export const getTestSeed = (filename: string) => `//Alice+${getTestHash(filename)}`;
async function usingPlaygroundsGeneral<T extends ChainHelperBase>(helperType: new(logger: ILogger) => T, url: string, code: (helper: T, privateKey: (seed: string | {filename?: string, url?: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>) {
const silentConsole = new SilentConsole();
@@ -65,49 +61,27 @@
}
}
-export const usingPlaygrounds = (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename?: string, url?: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => {
- return usingPlaygroundsGeneral<DevUniqueHelper>(DevUniqueHelper, url, code);
-};
+export const usingPlaygrounds = (code: (helper: DevUniqueHelper, privateKey: (seed: string | {filename?: string, url?: string, ignoreFundsPresence?: boolean}) => Promise<IKeyringPair>) => Promise<void>, url: string = config.substrateUrl) => usingPlaygroundsGeneral<DevUniqueHelper>(DevUniqueHelper, url, code);
-export const usingWestmintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevWestmintHelper>(DevWestmintHelper, url, code);
-};
+export const usingWestmintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevWestmintHelper>(DevWestmintHelper, url, code);
-export const usingStateminePlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevStatemineHelper>(DevWestmintHelper, url, code);
-};
+export const usingStateminePlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevStatemineHelper>(DevWestmintHelper, url, code);
-export const usingStatemintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevStatemintHelper>(DevWestmintHelper, url, code);
-};
+export const usingStatemintPlaygrounds = (url: string, code: (helper: DevWestmintHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevStatemintHelper>(DevWestmintHelper, url, code);
-export const usingRelayPlaygrounds = (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevRelayHelper>(DevRelayHelper, url, code);
-};
+export const usingRelayPlaygrounds = (url: string, code: (helper: DevRelayHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevRelayHelper>(DevRelayHelper, url, code);
-export const usingAcalaPlaygrounds = (url: string, code: (helper: DevAcalaHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevAcalaHelper>(DevAcalaHelper, url, code);
-};
+export const usingAcalaPlaygrounds = (url: string, code: (helper: DevAcalaHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevAcalaHelper>(DevAcalaHelper, url, code);
-export const usingKaruraPlaygrounds = (url: string, code: (helper: DevKaruraHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevKaruraHelper>(DevAcalaHelper, url, code);
-};
+export const usingKaruraPlaygrounds = (url: string, code: (helper: DevKaruraHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevKaruraHelper>(DevAcalaHelper, url, code);
-export const usingMoonbeamPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevMoonbeamHelper>(DevMoonbeamHelper, url, code);
-};
+export const usingMoonbeamPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevMoonbeamHelper>(DevMoonbeamHelper, url, code);
-export const usingMoonriverPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevMoonriverHelper>(DevMoonriverHelper, url, code);
-};
+export const usingMoonriverPlaygrounds = (url: string, code: (helper: DevMoonbeamHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevMoonriverHelper>(DevMoonriverHelper, url, code);
-export const usingAstarPlaygrounds = (url: string, code: (helper: DevAstarHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevAstarHelper>(DevAstarHelper, url, code);
-};
+export const usingAstarPlaygrounds = (url: string, code: (helper: DevAstarHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevAstarHelper>(DevAstarHelper, url, code);
-export const usingShidenPlaygrounds = (url: string, code: (helper: DevShidenHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
- return usingPlaygroundsGeneral<DevShidenHelper>(DevShidenHelper, url, code);
-};
+export const usingShidenPlaygrounds = (url: string, code: (helper: DevShidenHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => usingPlaygroundsGeneral<DevShidenHelper>(DevShidenHelper, url, code);
export const MINIMUM_DONOR_FUND = 100_000n;
export const DONOR_FUNDING = 2_000_000n;
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -771,9 +771,7 @@
// <<< Referendum voting <<<
// Wait the proposal to pass
- await this.helper.wait.expectEvent(3, Event.Democracy.Passed, event => {
- return event.referendumIndex() == referendumIndex;
- });
+ await this.helper.wait.expectEvent(3, Event.Democracy.Passed, event => event.referendumIndex() == referendumIndex);
await this.helper.wait.newBlocks(1);
@@ -924,7 +922,7 @@
event<T extends IEventHelper>(
maxBlocksToWait: number,
eventHelperType: new () => T,
- filter: (_: T) => boolean = () => { return true; },
+ filter: (_: T) => boolean = () => true,
) {
// eslint-disable-next-line no-async-promise-executor
const promise = new Promise<T | null>(async (resolve) => {
@@ -970,7 +968,7 @@
async expectEvent<T extends IEventHelper>(
maxBlocksToWait: number,
eventHelperType: new () => T,
- filter: (e: T) => boolean = () => { return true; },
+ filter: (e: T) => boolean = () => true,
) {
const e = await this.event(maxBlocksToWait, eventHelperType, filter);
if (e == null) {
@@ -1077,9 +1075,7 @@
async startCapture() {
this.stopCapture();
this.unsubscribe = (await this.helper.getApi().query.system.events((eventRecords: FrameSystemEventRecord[]) => {
- const newEvents = eventRecords.filter(r => {
- return r.event.section == this.eventSection && r.event.method == this.eventMethod;
- });
+ const newEvents = eventRecords.filter(r => r.event.section == this.eventSection && r.event.method == this.eventMethod);
this.events.push(...newEvents);
})) as any;
@@ -1105,12 +1101,10 @@
async payoutStakers(signer: IKeyringPair, stakersToPayout: number): Promise<{staker: string, stake: bigint, payout: bigint}[]> {
const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);
- return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {
- return {
- staker: e.event.data[0].toString(),
- stake: e.event.data[1].toBigInt(),
- payout: e.event.data[2].toBigInt(),
- };
- });
+ return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => ({
+ staker: e.event.data[0].toString(),
+ stake: e.event.data[1].toBigInt(),
+ payout: e.event.data[2].toBigInt(),
+ }));
}
}
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2395,7 +2395,7 @@
return total.toBigInt();
}
- async getLocked(address: TSubstrateAccount): Promise<[{ id: string, amount: bigint, reason: string }]> {
+ async getLocked(address: TSubstrateAccount): Promise<{ id: string, amount: bigint, reason: string }[]> {
const locks = (await this.helper.callRpc('api.query.balances.locks', [address])).toHuman();
return locks.map((lock: any) => ({id: lock.id, amount: BigInt(lock.amount.replace(/,/g, '')), reasons: lock.reasons}));
}
@@ -2581,14 +2581,12 @@
*/
async getVestingSchedules(address: TSubstrateAccount): Promise<{ start: bigint, period: bigint, periodCount: bigint, perPeriod: bigint }[]> {
const schedule = (await this.helper.callRpc('api.query.vesting.vestingSchedules', [address])).toJSON();
- return schedule.map((schedule: any) => {
- return {
- start: BigInt(schedule.start),
- period: BigInt(schedule.period),
- periodCount: BigInt(schedule.periodCount),
- perPeriod: BigInt(schedule.perPeriod),
- };
- });
+ return schedule.map((schedule: any) => ({
+ start: BigInt(schedule.start),
+ period: BigInt(schedule.period),
+ periodCount: BigInt(schedule.periodCount),
+ perPeriod: BigInt(schedule.perPeriod),
+ }));
}
/**
@@ -2804,12 +2802,10 @@
*/
async getTotalStakedPerBlock(address: ICrossAccountId): Promise<IStakingInfo[]> {
const rawTotalStakerdPerBlock = await this.helper.callRpc('api.rpc.appPromotion.totalStakedPerBlock', [address]);
- return rawTotalStakerdPerBlock.map(([block, amount]: any[]) => {
- return {
- block: block.toBigInt(),
- amount: amount.toBigInt(),
- };
- });
+ return rawTotalStakerdPerBlock.map(([block, amount]: any[]) => ({
+ block: block.toBigInt(),
+ amount: amount.toBigInt(),
+ }));
}
/**
@@ -2828,12 +2824,10 @@
*/
async getPendingUnstakePerBlock(address: ICrossAccountId): Promise<IStakingInfo[]> {
const rawUnstakedPerBlock = await this.helper.callRpc('api.rpc.appPromotion.pendingUnstakePerBlock', [address]);
- const result = rawUnstakedPerBlock.map(([block, amount]: any[]) => {
- return {
- block: block.toBigInt(),
- amount: amount.toBigInt(),
- };
- });
+ const result = rawUnstakedPerBlock.map(([block, amount]: any[]) => ({
+ block: block.toBigInt(),
+ amount: amount.toBigInt(),
+ }));
return result;
}
}
tests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -682,10 +682,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -765,10 +763,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -780,10 +776,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -858,10 +852,8 @@
});
const expectFailedToTransact = async (helper: DevUniqueHelper, messageSent: any) => {
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == messageSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == messageSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
};
itSub('Quartz rejects KAR tokens from Karura', async ({helper}) => {
@@ -1172,10 +1164,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -1263,10 +1253,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1282,10 +1270,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1544,10 +1530,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -1627,10 +1611,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1642,10 +1624,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
tests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -684,10 +684,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -767,10 +765,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -782,10 +778,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -860,10 +854,8 @@
});
const expectFailedToTransact = async (helper: DevUniqueHelper, messageSent: any) => {
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == messageSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == messageSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
};
itSub('Unique rejects ACA tokens from Acala', async ({helper}) => {
@@ -1175,10 +1167,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -1266,10 +1256,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1285,10 +1273,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1546,10 +1532,8 @@
maliciousXcmProgramSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramSent.messageHash()
- && event.outcome().isFailedToTransactAsset;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramSent.messageHash()
+ && event.outcome().isFailedToTransactAsset);
targetAccountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(targetAccountBalance).to.be.equal(0n);
@@ -1629,10 +1613,8 @@
maliciousXcmProgramFullIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramFullIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
let accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);
@@ -1644,10 +1626,8 @@
maliciousXcmProgramHereIdSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
});
- await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => {
- return event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
- && event.outcome().isUntrustedReserveLocation;
- });
+ await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.Fail, event => event.messageHash() == maliciousXcmProgramHereIdSent.messageHash()
+ && event.outcome().isUntrustedReserveLocation);
accountBalance = await helper.balance.getSubstrate(targetAccount.address);
expect(accountBalance).to.be.equal(0n);