--- 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 . -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)); }); }); --- a/tests/src/eth/collectionProperties.test.ts +++ b/tests/src/eth/collectionProperties.test.ts @@ -18,7 +18,6 @@ import {Pallets} from '../util'; import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types'; import {IKeyringPair} from '@polkadot/types/types'; -import {Contract} from 'web3-eth-contract'; describe('EVM collection properties', () => { let donor: IKeyringPair; @@ -99,7 +98,7 @@ const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller); await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too - const collection1 = await helper.nft.getCollectionObject(collectionId); + const collection1 = helper.nft.getCollectionObject(collectionId); const data1 = await collection1.getData(); expect(data1?.raw.flags.erc721metadata).to.be.false; expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false; @@ -109,18 +108,18 @@ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true; - const collection2 = await helper.nft.getCollectionObject(collectionId); + const collection2 = helper.nft.getCollectionObject(collectionId); const data2 = await collection2.getData(); expect(data2?.raw.flags.erc721metadata).to.be.true; - const TPPs = data2?.raw.tokenPropertyPermissions; - expect(TPPs?.length).to.equal(2); + const propertyPermissions = data2?.raw.tokenPropertyPermissions; + expect(propertyPermissions?.length).to.equal(2); - expect(TPPs.find((tpp: ITokenPropertyPermission) => { + expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => { return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner; })).to.be.not.null; - expect(TPPs.find((tpp: ITokenPropertyPermission) => { + expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => { return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner; })).to.be.not.null; --- 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,