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

--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-import {Contract} from 'web3-eth-contract';
-
 import {IKeyringPair} from '@polkadot/types/types';
 import {EthUniqueHelper, itEth, usingEthPlaygrounds, expect} from './util';
 
@@ -93,7 +91,7 @@
       const donor = await privateKey({filename: __filename});
       const [alice] = await helper.arrange.createAccounts([10n], donor);
       ({collectionId: simpleNftCollectionId} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));
-      minter = helper.eth.createAccount();
+      minter = await helper.eth.createAccountWithBalance(donor);
       ({collectionId: erc721MetadataCompatibleNftCollectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(minter, 'n', 'd', 'p', BASE_URI));
     });
   });

18import {Pallets} from '../util';18import {Pallets} from '../util';
19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';
20import {IKeyringPair} from '@polkadot/types/types';20import {IKeyringPair} from '@polkadot/types/types';
21import {Contract} from 'web3-eth-contract';
2221
23describe('EVM collection properties', () => {22describe('EVM collection properties', () => {
24  let donor: IKeyringPair;23  let donor: IKeyringPair;
99    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);98    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);
100    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too99    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too
101100
102    const collection1 = await helper.nft.getCollectionObject(collectionId);101    const collection1 = helper.nft.getCollectionObject(collectionId);
103    const data1 = await collection1.getData();102    const data1 = await collection1.getData();
104    expect(data1?.raw.flags.erc721metadata).to.be.false;103    expect(data1?.raw.flags.erc721metadata).to.be.false;
105    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;104    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;
109108
110    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;109    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;
111110
112    const collection2 = await helper.nft.getCollectionObject(collectionId);111    const collection2 = helper.nft.getCollectionObject(collectionId);
113    const data2 = await collection2.getData();112    const data2 = await collection2.getData();
114    expect(data2?.raw.flags.erc721metadata).to.be.true;113    expect(data2?.raw.flags.erc721metadata).to.be.true;
115114
116    const TPPs = data2?.raw.tokenPropertyPermissions;115    const propertyPermissions = data2?.raw.tokenPropertyPermissions;
117    expect(TPPs?.length).to.equal(2);116    expect(propertyPermissions?.length).to.equal(2);
118117
119    expect(TPPs.find((tpp: ITokenPropertyPermission) => {118    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
120      return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;119      return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
121    })).to.be.not.null;120    })).to.be.not.null;
122121
123    expect(TPPs.find((tpp: ITokenPropertyPermission) => {122    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
124      return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;123      return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
125    })).to.be.not.null;124    })).to.be.not.null;
126125

--- a/tests/src/eth/util/index.ts
+++ b/tests/src/eth/util/index.ts
@@ -14,7 +14,7 @@
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import chaiLike from 'chai-like';
-import {getTestSeed, requirePalletsOrSkip} from '../../util';
+import {getTestSeed, MINIMUM_DONOR_FUND, requirePalletsOrSkip} from '../../util';
 
 chai.use(chaiAsPromised);
 chai.use(chaiLike);
@@ -43,7 +43,7 @@
       else {
         const actualSeed = getTestSeed(seed.filename);
         let account = helper.util.fromSeed(actualSeed, ss58Format);
-        if (await helper.balance.getSubstrate(account.address) == 0n) {
+        if (await helper.balance.getSubstrate(account.address) < MINIMUM_DONOR_FUND) {
           console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
           account = helper.util.fromSeed('//Alice', ss58Format);
         }

--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -62,7 +62,7 @@
       const chain = await helper.callRpc('api.rpc.system.chain', []);
 
       const refungible = 'refungible';
-      const scheduler = 'scheduler';
+      // const scheduler = 'scheduler';
       const foreignAssets = 'foreignassets';
       const rmrkPallets = ['rmrkcore', 'rmrkequip'];
       const appPromotion = 'apppromotion';
@@ -70,7 +70,7 @@
       if (chain.eq('OPAL by UNIQUE')) {
         requiredPallets.push(
           refungible,
-          scheduler,
+          // scheduler,
           foreignAssets,
           appPromotion,
           ...rmrkPallets,