git.delta.rocks / unique-network / refs/commits / f84c26a4e1e7

difftreelog

fix tests

Trubnikov Sergey2022-12-09parent: #62d6042.patch.diff
in: master

2 files changed

modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -160,9 +160,10 @@
       // User can mint token without balance:
       {
         const result = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
-        const events = helper.eth.normalizeEvents(result.events);
+        const event = helper.eth.normalizeEvents(result.events)
+        .find(event => event.event === 'Transfer');;
   
-        expect(events).to.be.deep.equal([
+        expect(event).to.be.deep.equal(
           {
             address: collectionAddress,
             event: 'Transfer',
@@ -274,10 +275,11 @@
       const mintingResult = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
       const tokenId = mintingResult.events.Transfer.returnValues.tokenId;
   
-      const events = helper.eth.normalizeEvents(mintingResult.events);
+      const event = helper.eth.normalizeEvents(mintingResult.events)
+      .find(event => event.event === 'Transfer');
       const address = helper.ethAddress.fromCollectionId(collectionId);
   
-      expect(events).to.be.deep.equal([
+      expect(event).to.be.deep.equal(
         {
           address,
           event: 'Transfer',
modifiedtests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth
after · tests/src/eth/proxy/nonFungibleProxy.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {readFile} from 'fs/promises';18import {IKeyringPair} from '@polkadot/types/types';19import {EthUniqueHelper, itEth, usingEthPlaygrounds, expect} from '../util';202122async function proxyWrap(helper: EthUniqueHelper, wrapped: any, donor: IKeyringPair) {23  // Proxy owner has no special privilegies, we don't need to reuse them24  const owner = await helper.eth.createAccountWithBalance(donor);25  const web3 = helper.getWeb3();26  const proxyContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/UniqueNFTProxy.abi`)).toString()), undefined, {27    from: owner,28    gas: helper.eth.DEFAULT_GAS,29  });30  const proxy = await proxyContract.deploy({data: (await readFile(`${__dirname}/UniqueNFTProxy.bin`)).toString(), arguments: [wrapped.options.address]}).send({from: owner});31  return proxy;32}3334describe('NFT (Via EVM proxy): Information getting', () => {35  let alice: IKeyringPair;36  let donor: IKeyringPair;3738  before(async function() {39    await usingEthPlaygrounds(async (helper, privateKey) => {40      donor = await privateKey({filename: __filename});41      [alice] = await helper.arrange.createAccounts([10n], donor);42    });43  });4445  itEth('totalSupply', async ({helper}) => {46    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});47    const caller = await helper.eth.createAccountWithBalance(donor);48    await collection.mintToken(alice, {Substrate: alice.address});4950    const address = helper.ethAddress.fromCollectionId(collection.collectionId);51    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);52    const contract = await proxyWrap(helper, evmCollection, donor);53    const totalSupply = await contract.methods.totalSupply().call();5455    expect(totalSupply).to.equal('1');56  });5758  itEth('balanceOf', async ({helper}) => {59    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});6061    const caller = await helper.eth.createAccountWithBalance(donor);62    await collection.mintMultipleTokens(alice, [63      {owner: {Ethereum: caller}},64      {owner: {Ethereum: caller}},65      {owner: {Ethereum: caller}},66    ]);6768    const address = helper.ethAddress.fromCollectionId(collection.collectionId);69    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);70    const contract = await proxyWrap(helper, evmCollection, donor);71    const balance = await contract.methods.balanceOf(caller).call();7273    expect(balance).to.equal('3');74  });7576  itEth('ownerOf', async ({helper}) => {77    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});7879    const caller = await helper.eth.createAccountWithBalance(donor);80    const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});8182    const address = helper.ethAddress.fromCollectionId(collection.collectionId);83    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);84    const contract = await proxyWrap(helper, evmCollection, donor);85    const owner = await contract.methods.ownerOf(tokenId).call();8687    expect(owner).to.equal(caller);88  });89});9091describe('NFT (Via EVM proxy): Plain calls', () => {92  let alice: IKeyringPair;93  let donor: IKeyringPair;9495  before(async function() {96    await usingEthPlaygrounds(async (helper, privateKey) => {97      donor = await privateKey({filename: __filename});98      [alice] = await helper.arrange.createAccounts([10n], donor);99    });100  });101102  // Soft-deprecated103  itEth('[eth] Can perform mint()', async ({helper}) => {104    const owner = await helper.eth.createAccountWithBalance(donor);105    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'A', 'A', 'A', '');106    const caller = await helper.eth.createAccountWithBalance(donor);107    const receiver = helper.eth.createAccount();108109    const collectionEvmOwned = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);110    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);111    const contract = await proxyWrap(helper, collectionEvm, donor);112    await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();113114    {115      const nextTokenId = await contract.methods.nextTokenId().call();116      const result = await contract.methods.mintWithTokenURI(receiver, nextTokenId, 'Test URI').send({from: caller});117      const tokenId = result.events.Transfer.returnValues.tokenId;118      expect(tokenId).to.be.equal('1');119120      const event = helper.eth.normalizeEvents(result.events)121        .find(event => event.event === 'Transfer')!;122      event.address = event.address.toLocaleLowerCase();123124      expect(event).to.be.deep.equal(125        {126          address: collectionAddress.toLocaleLowerCase(),127          event: 'Transfer',128          args: {129            from: '0x0000000000000000000000000000000000000000',130            to: receiver,131            tokenId,132          },133        },134      );135136      expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');137    }138  });139140  itEth('[cross] Can perform mint()', async ({helper}) => {141    const owner = await helper.eth.createAccountWithBalance(donor);142    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'A', 'A', 'A', '');143    const caller = await helper.eth.createAccountWithBalance(donor);144    const receiver = helper.eth.createAccount();145146    const collectionEvmOwned = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);147    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);148    const contract = await proxyWrap(helper, collectionEvm, donor);149    const contractAddressCross = helper.ethCrossAccount.fromAddress(contract.options.address);150    await collectionEvmOwned.methods.addCollectionAdminCross(contractAddressCross).send();151152    {153      const nextTokenId = await contract.methods.nextTokenId().call();154      const result = await contract.methods.mintWithTokenURI(receiver, nextTokenId, 'Test URI').send({from: caller});155      const tokenId = result.events.Transfer.returnValues.tokenId;156      expect(tokenId).to.be.equal('1');157158      const event = helper.eth.normalizeEvents(result.events)159        .find(event => event.event === 'Transfer')!;160      event.address = event.address.toLocaleLowerCase();161162      expect(event).to.be.deep.equal(163        {164          address: collectionAddress.toLocaleLowerCase(),165          event: 'Transfer',166          args: {167            from: '0x0000000000000000000000000000000000000000',168            to: receiver,169            tokenId,170          },171        },172      );173174      expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');175    }176  });177178  //TODO: CORE-302 add eth methods179  itEth.skip('Can perform mintBulk()', async ({helper}) => {180    const collection = await helper.nft.mintCollection(donor, {name: 'New', description: 'New collection', tokenPrefix: 'NEW'});181182    const caller = await helper.eth.createAccountWithBalance(donor, 30n);183    const receiver = helper.eth.createAccount();184185    const address = helper.ethAddress.fromCollectionId(collection.collectionId);186    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);187    const contract = await proxyWrap(helper, evmCollection, donor);188    await collection.addAdmin(donor, {Ethereum: contract.options.address});189190    {191      const nextTokenId = await contract.methods.nextTokenId().call();192      expect(nextTokenId).to.be.equal('1');193      const result = await contract.methods.mintBulkWithTokenURI(194        receiver,195        [196          [nextTokenId, 'Test URI 0'],197          [+nextTokenId + 1, 'Test URI 1'],198          [+nextTokenId + 2, 'Test URI 2'],199        ],200      ).send({from: caller});201      const events = helper.eth.normalizeEvents(result.events);202203      expect(events).to.be.deep.equal([204        {205          address,206          event: 'Transfer',207          args: {208            from: '0x0000000000000000000000000000000000000000',209            to: receiver,210            tokenId: nextTokenId,211          },212        },213        {214          address,215          event: 'Transfer',216          args: {217            from: '0x0000000000000000000000000000000000000000',218            to: receiver,219            tokenId: String(+nextTokenId + 1),220          },221        },222        {223          address,224          event: 'Transfer',225          args: {226            from: '0x0000000000000000000000000000000000000000',227            to: receiver,228            tokenId: String(+nextTokenId + 2),229          },230        },231      ]);232233      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');234      expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');235      expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');236    }237  });238239  itEth('Can perform burn()', async ({helper}) => {240    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});241    const caller = await helper.eth.createAccountWithBalance(donor);242243    const address = helper.ethAddress.fromCollectionId(collection.collectionId);244    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);245    const contract = await proxyWrap(helper, evmCollection, donor);246    const {tokenId} = await collection.mintToken(alice, {Ethereum: contract.options.address});247    await collection.addAdmin(alice, {Ethereum: contract.options.address});248249    {250      const result = await contract.methods.burn(tokenId).send({from: caller});251      const events = helper.eth.normalizeEvents(result.events);252253      expect(events).to.be.deep.equal([254        {255          address,256          event: 'Transfer',257          args: {258            from: contract.options.address,259            to: '0x0000000000000000000000000000000000000000',260            tokenId: tokenId.toString(),261          },262        },263      ]);264    }265  });266267  itEth('Can perform approve()', async ({helper}) => {268    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});269    const caller = await helper.eth.createAccountWithBalance(donor);270    const spender = helper.eth.createAccount();271272    const address = helper.ethAddress.fromCollectionId(collection.collectionId);273    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);274    const contract = await proxyWrap(helper, evmCollection, donor);275    const {tokenId} = await collection.mintToken(alice, {Ethereum: contract.options.address});276277    {278      const result = await contract.methods.approve(spender, tokenId).send({from: caller, gas: helper.eth.DEFAULT_GAS});279      const events = helper.eth.normalizeEvents(result.events);280281      expect(events).to.be.deep.equal([282        {283          address,284          event: 'Approval',285          args: {286            owner: contract.options.address,287            approved: spender,288            tokenId: tokenId.toString(),289          },290        },291      ]);292    }293  });294295  itEth('Can perform transferFrom()', async ({helper}) => {296    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});297    const caller = await helper.eth.createAccountWithBalance(donor);298    const owner = await helper.eth.createAccountWithBalance(donor);299300    const receiver = helper.eth.createAccount();301302    const address = helper.ethAddress.fromCollectionId(collection.collectionId);303    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);304    const contract = await proxyWrap(helper, evmCollection, donor);305    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});306307    await evmCollection.methods.approve(contract.options.address, tokenId).send({from: owner});308309    {310      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: caller});311      const events = helper.eth.normalizeEvents(result.events);312      expect(events).to.be.deep.equal([313        {314          address,315          event: 'Transfer',316          args: {317            from: owner,318            to: receiver,319            tokenId: tokenId.toString(),320          },321        },322      ]);323    }324325    {326      const balance = await contract.methods.balanceOf(receiver).call();327      expect(+balance).to.equal(1);328    }329330    {331      const balance = await contract.methods.balanceOf(contract.options.address).call();332      expect(+balance).to.equal(0);333    }334  });335336  itEth('Can perform transfer()', async ({helper}) => {337    const collection = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'});338    const caller = await helper.eth.createAccountWithBalance(donor);339    const receiver = helper.eth.createAccount();340341    const address = helper.ethAddress.fromCollectionId(collection.collectionId);342    const evmCollection = helper.ethNativeContract.collection(address, 'nft', caller);343    const contract = await proxyWrap(helper, evmCollection, donor);344    const {tokenId} = await collection.mintToken(alice, {Ethereum: contract.options.address});345346    {347      const result = await contract.methods.transfer(receiver, tokenId).send({from: caller});348      const events = helper.eth.normalizeEvents(result.events);349      expect(events).to.be.deep.equal([350        {351          address,352          event: 'Transfer',353          args: {354            from: contract.options.address,355            to: receiver,356            tokenId: tokenId.toString(),357          },358        },359      ]);360    }361362    {363      const balance = await contract.methods.balanceOf(contract.options.address).call();364      expect(+balance).to.equal(0);365    }366367    {368      const balance = await contract.methods.balanceOf(receiver).call();369      expect(+balance).to.equal(1);370    }371  });372});