From a8ddb93c293bbfee66cb487b949c85f4b6bbf2a2 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Wed, 17 May 2023 09:42:19 +0000 Subject: [PATCH] fix PR commets --- --- a/tests/src/eth/nativeFungible.test.ts +++ b/tests/src/eth/nativeFungible.test.ts @@ -24,7 +24,6 @@ before(async function() { await usingEthPlaygrounds(async (helper, privateKey) => { donor = await privateKey({url: import.meta.url}); - // [alice] = await helper.arrange.createAccounts([30n], donor); }); }); @@ -101,7 +100,7 @@ const balanceReceiverAfter = await helper.balance.getEthereum(receiver); expect(balanceOwnerBefore - 50n > balanceOwnerAfter).to.be.true; - expect(balanceReceiverBefore === balanceReceiverAfter - 50n).to.be.true; + expect(balanceReceiverBefore + 50n).to.be.equal(balanceReceiverAfter); }); itEth('transferFrom()', async ({helper}) => { @@ -131,7 +130,6 @@ before(async function() { await usingEthPlaygrounds(async (helper, privateKey) => { donor = await privateKey({url: import.meta.url}); - // [alice] = await helper.arrange.createAccounts([30n], donor); }); }); --- a/tests/src/eth/util/playgrounds/unique.dev.ts +++ b/tests/src/eth/util/playgrounds/unique.dev.ts @@ -142,7 +142,7 @@ async collection(address: string, mode: TCollectionMode, caller?: string, mergeDeprecated = false) { let abi; - if (address === '0x17C4e6453cC49aaAAEaCA894E6d9683e00000000') { + if (address === this.helper.ethAddress.fromCollectionId(0)) { abi = nativeFungibleAbi; } else { abi ={ --- a/tests/src/sub/nesting/common.test.ts +++ b/tests/src/sub/nesting/common.test.ts @@ -103,7 +103,7 @@ nesting: {tokenOwner: true, restricted: testCase.restrictedMode ? [collectionForNesting.collectionId] : null}, }); - // Alice can mint and nest token: + // Bob can nest Native FT into their NFT: await collectionForNesting.transfer(bob, targetTokenBob.nestingAccount(), 50n); expect(await collectionForNesting.getBalance(targetTokenBob.nestingAccount())).eq(50n); }); --- a/tests/src/sub/nesting/nesting.negative.test.ts +++ b/tests/src/sub/nesting/nesting.negative.test.ts @@ -69,7 +69,7 @@ ? collectionForNesting.mint(alice, 100n, targetToken.nestingAccount()) : collectionForNesting.transfer(alice, targetToken.nestingAccount(), 100n)).to.be.rejectedWith('common.UserIsNotAllowedToNest'); - // Alice can mint and nest token: + // Alice can't mint and nest tokens: if (testCase.mode === 'ft') { await collectionForNesting.mint(alice, 100n); } @@ -100,7 +100,7 @@ case 'nft': nestedTokenBob = await (nestedCollectionBob as UniqueNFTCollection).mintToken(bob); break; case 'rft': nestedTokenBob = await (nestedCollectionBob as UniqueRFTCollection).mintToken(bob, 100n); break; case 'ft': await (nestedCollectionBob as UniqueFTCollection).mint(bob, 100n); break; - case 'native ft': break; + case 'native ft': await expect((nestedCollectionBob as UniqueFTCollection).mint(bob, 100n)).to.be.rejectedWith('common.UnsupportedOperation'); break; } // Bob non-owner of targetToken and non admin of targetCollection, so @@ -109,7 +109,7 @@ case 'nft': await expect((nestedCollectionBob as UniqueNFTCollection).mintToken(bob, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; case 'rft': await expect((nestedCollectionBob as UniqueRFTCollection).mintToken(bob, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; case 'ft': await expect((nestedCollectionBob as UniqueFTCollection).mint(bob, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UserIsNotAllowedToNest'); break; - case 'native ft': break; + case 'native ft': await expect((nestedCollectionBob as UniqueFTCollection).mint(bob, 100n, targetToken.nestingAccount())).to.be.rejectedWith('common.UnsupportedOperation'); break; } // 2. cannot nest existing token: -- gitstuff