difftreelog
Merge pull request #665 from UniqueNetwork/tests/fix-eslint
in: master
Fix eslint errors
8 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6711,24 +6711,6 @@
]
[[package]]
-name = "pallet-unique-scheduler-v2"
-version = "0.1.0"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "pallet-preimage",
- "parity-scale-codec 3.2.1",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "substrate-test-utils",
-]
-
-[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"
tests/src/eth/base.test.tsdiffbeforeafterboth--- 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';
@@ -44,7 +42,7 @@
from: userA,
to: userB,
value: '1000000',
- gas: helper.eth.DEFAULT_GAS
+ gas: helper.eth.DEFAULT_GAS,
}));
const balanceB = await helper.balance.getEthereum(userB);
expect(cost - balanceB < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;
@@ -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));
});
});
tests/src/eth/collectionProperties.test.tsdiffbeforeafterboth1// 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 {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {Pallets} from '../util';19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';20import {IKeyringPair} from '@polkadot/types/types';21import {Contract} from 'web3-eth-contract';2223describe('EVM collection properties', () => {24 let donor: IKeyringPair;25 let alice: IKeyringPair;2627 before(async function() {28 await usingEthPlaygrounds(async (_helper, privateKey) => {29 donor = await privateKey({filename: __filename});30 [alice] = await _helper.arrange.createAccounts([10n], donor);31 });32 });3334 itEth('Can be set', async({helper}) => {35 const caller = await helper.eth.createAccountWithBalance(donor);36 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});37 await collection.addAdmin(alice, {Ethereum: caller});3839 const address = helper.ethAddress.fromCollectionId(collection.collectionId);40 const contract = helper.ethNativeContract.collection(address, 'nft', caller);4142 await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send({from: caller});4344 const raw = (await collection.getData())?.raw;4546 expect(raw.properties[0].value).to.equal('testValue');47 });4849 itEth('Can be deleted', async({helper}) => {50 const caller = await helper.eth.createAccountWithBalance(donor);51 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});5253 await collection.addAdmin(alice, {Ethereum: caller});5455 const address = helper.ethAddress.fromCollectionId(collection.collectionId);56 const contract = helper.ethNativeContract.collection(address, 'nft', caller);5758 await contract.methods.deleteCollectionProperty('testKey').send({from: caller});5960 const raw = (await collection.getData())?.raw;6162 expect(raw.properties.length).to.equal(0);63 });6465 itEth('Can be read', async({helper}) => {66 const caller = helper.eth.createAccount();67 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});6869 const address = helper.ethAddress.fromCollectionId(collection.collectionId);70 const contract = helper.ethNativeContract.collection(address, 'nft', caller);7172 const value = await contract.methods.collectionProperty('testKey').call();73 expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));74 });75});7677describe('Supports ERC721Metadata', () => {78 let donor: IKeyringPair;7980 before(async function() {81 await usingEthPlaygrounds(async (_helper, privateKey) => {82 donor = await privateKey({filename: __filename});83 });84 });8586 const checkERC721Metadata = async (helper: EthUniqueHelper, mode: 'nft' | 'rft') => {87 const caller = await helper.eth.createAccountWithBalance(donor);88 const bruh = await helper.eth.createAccountWithBalance(donor);8990 const BASE_URI = 'base/'91 const SUFFIX = 'suffix1'92 const URI = 'uri1'9394 const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);95 const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection'9697 const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p')9899 const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);100 await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too101102 const collection1 = await helper.nft.getCollectionObject(collectionId);103 const data1 = await collection1.getData()104 expect(data1?.raw.flags.erc721metadata).to.be.false;105 expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;106107 await collectionHelpers.methods.makeCollectionERC721MetadataCompatible(collectionAddress, BASE_URI)108 .send({from: bruh});109110 expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;111112 const collection2 = await helper.nft.getCollectionObject(collectionId);113 const data2 = await collection2.getData()114 expect(data2?.raw.flags.erc721metadata).to.be.true;115116 const TPPs = data2?.raw.tokenPropertyPermissions117 expect(TPPs?.length).to.equal(2);118119 expect(TPPs.find((tpp: ITokenPropertyPermission) => {120 return tpp.key === "URI" && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner121 })).to.be.not.null122123 expect(TPPs.find((tpp: ITokenPropertyPermission) => {124 return tpp.key === "URISuffix" && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner125 })).to.be.not.null126127 expect(data2?.raw.properties?.find((property: IProperty) => {128 return property.key === "baseURI" && property.value === BASE_URI129 })).to.be.not.null130131 const token1Result = await contract.methods.mint(bruh).send();132 const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;133134 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);135136 await contract.methods.setProperty(tokenId1, "URISuffix", Buffer.from(SUFFIX)).send();137 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);138139 await contract.methods.setProperty(tokenId1, "URI", Buffer.from(URI)).send();140 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);141142 await contract.methods.deleteProperty(tokenId1, "URI").send();143 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);144145 const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();146 const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;147148 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);149150 await contract.methods.deleteProperty(tokenId2, "URI").send();151 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);152153 await contract.methods.setProperty(tokenId2, "URISuffix", Buffer.from(SUFFIX)).send();154 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);155 }156157 itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {158 await checkERC721Metadata(helper, 'nft');159 });160161 itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => {162 await checkERC721Metadata(helper, 'rft');163 });164});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 {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {Pallets} from '../util';19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';20import {IKeyringPair} from '@polkadot/types/types';2122describe('EVM collection properties', () => {23 let donor: IKeyringPair;24 let alice: IKeyringPair;2526 before(async function() {27 await usingEthPlaygrounds(async (_helper, privateKey) => {28 donor = await privateKey({filename: __filename});29 [alice] = await _helper.arrange.createAccounts([10n], donor);30 });31 });3233 itEth('Can be set', async({helper}) => {34 const caller = await helper.eth.createAccountWithBalance(donor);35 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});36 await collection.addAdmin(alice, {Ethereum: caller});3738 const address = helper.ethAddress.fromCollectionId(collection.collectionId);39 const contract = helper.ethNativeContract.collection(address, 'nft', caller);4041 await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send({from: caller});4243 const raw = (await collection.getData())?.raw;4445 expect(raw.properties[0].value).to.equal('testValue');46 });4748 itEth('Can be deleted', async({helper}) => {49 const caller = await helper.eth.createAccountWithBalance(donor);50 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});5152 await collection.addAdmin(alice, {Ethereum: caller});5354 const address = helper.ethAddress.fromCollectionId(collection.collectionId);55 const contract = helper.ethNativeContract.collection(address, 'nft', caller);5657 await contract.methods.deleteCollectionProperty('testKey').send({from: caller});5859 const raw = (await collection.getData())?.raw;6061 expect(raw.properties.length).to.equal(0);62 });6364 itEth('Can be read', async({helper}) => {65 const caller = helper.eth.createAccount();66 const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});6768 const address = helper.ethAddress.fromCollectionId(collection.collectionId);69 const contract = helper.ethNativeContract.collection(address, 'nft', caller);7071 const value = await contract.methods.collectionProperty('testKey').call();72 expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));73 });74});7576describe('Supports ERC721Metadata', () => {77 let donor: IKeyringPair;7879 before(async function() {80 await usingEthPlaygrounds(async (_helper, privateKey) => {81 donor = await privateKey({filename: __filename});82 });83 });8485 const checkERC721Metadata = async (helper: EthUniqueHelper, mode: 'nft' | 'rft') => {86 const caller = await helper.eth.createAccountWithBalance(donor);87 const bruh = await helper.eth.createAccountWithBalance(donor);8889 const BASE_URI = 'base/';90 const SUFFIX = 'suffix1';91 const URI = 'uri1';9293 const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);94 const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection';9596 const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p');9798 const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);99 await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too100101 const collection1 = helper.nft.getCollectionObject(collectionId);102 const data1 = await collection1.getData();103 expect(data1?.raw.flags.erc721metadata).to.be.false;104 expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;105106 await collectionHelpers.methods.makeCollectionERC721MetadataCompatible(collectionAddress, BASE_URI)107 .send({from: bruh});108109 expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;110111 const collection2 = helper.nft.getCollectionObject(collectionId);112 const data2 = await collection2.getData();113 expect(data2?.raw.flags.erc721metadata).to.be.true;114115 const propertyPermissions = data2?.raw.tokenPropertyPermissions;116 expect(propertyPermissions?.length).to.equal(2);117118 expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {119 return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;120 })).to.be.not.null;121122 expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {123 return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;124 })).to.be.not.null;125126 expect(data2?.raw.properties?.find((property: IProperty) => {127 return property.key === 'baseURI' && property.value === BASE_URI;128 })).to.be.not.null;129130 const token1Result = await contract.methods.mint(bruh).send();131 const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;132133 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);134135 await contract.methods.setProperty(tokenId1, 'URISuffix', Buffer.from(SUFFIX)).send();136 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);137138 await contract.methods.setProperty(tokenId1, 'URI', Buffer.from(URI)).send();139 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);140141 await contract.methods.deleteProperty(tokenId1, 'URI').send();142 expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);143144 const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();145 const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;146147 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);148149 await contract.methods.deleteProperty(tokenId2, 'URI').send();150 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);151152 await contract.methods.setProperty(tokenId2, 'URISuffix', Buffer.from(SUFFIX)).send();153 expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);154 };155156 itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {157 await checkERC721Metadata(helper, 'nft');158 });159160 itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => {161 await checkERC721Metadata(helper, 'rft');162 });163});tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -247,7 +247,7 @@
const userCollectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', user);
- let result = await userCollectionEvm.methods.mintWithTokenURI(user, 'Test URI',).send();
+ const result = await userCollectionEvm.methods.mintWithTokenURI(user, 'Test URI').send();
const tokenId = result.events.Transfer.returnValues.tokenId;
const events = helper.eth.normalizeEvents(result.events);
tests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -111,7 +111,7 @@
await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();
{
- const nextTokenId = await contract.methods.nextTokenId().call()
+ const nextTokenId = await contract.methods.nextTokenId().call();
const result = await contract.methods.mintWithTokenURI(receiver, nextTokenId, 'Test URI').send({from: caller});
const tokenId = result.events.Transfer.returnValues.tokenId;
expect(tokenId).to.be.equal('1');
tests/src/eth/util/index.tsdiffbeforeafterboth--- 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);
}
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -189,7 +189,7 @@
async createERC721MetadataCompatibleNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
- const {collectionId, collectionAddress} = await this.createNFTCollection(signer, name, description, tokenPrefix)
+ const {collectionId, collectionAddress} = await this.createNFTCollection(signer, name, description, tokenPrefix);
await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();
@@ -211,7 +211,7 @@
async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
- const {collectionId, collectionAddress} = await this.createRFTCollection(signer, name, description, tokenPrefix)
+ const {collectionId, collectionAddress} = await this.createRFTCollection(signer, name, description, tokenPrefix);
await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- 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,