difftreelog
path: Fix other broken tests.
in: master
2 files changed
tests/src/eth/marketplace/marketplace.test.tsdiffbeforeafterboth--- a/tests/src/eth/marketplace/marketplace.test.ts
+++ b/tests/src/eth/marketplace/marketplace.test.ts
@@ -39,6 +39,7 @@
describe('Matcher contract usage', () => {
itWeb3('With UNQ', async ({api, web3, privateKeyWrapper}) => {
const alice = privateKeyWrapper('//Alice');
+ const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
from: matcherOwner,
@@ -48,7 +49,9 @@
const helpers = contractHelpers(web3, matcherOwner);
await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
- await transferBalanceToEth(api, alice, matcher.options.address);
+
+ await helpers.methods.setSponsor(matcher.options.address, sponsor).send({from: matcherOwner});
+ await helpers.methods.confirmSponsorship(matcher.options.address).send({from: sponsor});
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
@@ -100,6 +103,7 @@
itWeb3('With escrow', async ({api, web3, privateKeyWrapper}) => {
const alice = privateKeyWrapper('//Alice');
+ const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const matcherOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const escrow = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const matcherContract = new web3.eth.Contract(JSON.parse((await readFile(`${__dirname}/MarketPlace.abi`)).toString()), undefined, {
@@ -111,7 +115,9 @@
const helpers = contractHelpers(web3, matcherOwner);
await helpers.methods.setSponsoringMode(matcher.options.address, SponsoringMode.Allowlisted).send({from: matcherOwner});
await helpers.methods.setSponsoringRateLimit(matcher.options.address, 1).send({from: matcherOwner});
- await transferBalanceToEth(api, alice, matcher.options.address);
+
+ await helpers.methods.setSponsor(matcher.options.address, sponsor).send({from: matcherOwner});
+ await helpers.methods.confirmSponsorship(matcher.options.address).send({from: sponsor});
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await setCollectionLimitsExpectSuccess(alice, collectionId, {sponsorApproveTimeout: 1});
tests/src/eth/sponsoring.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 {expect} from 'chai';18import {contractHelpers, createEthAccount, createEthAccountWithBalance, deployCollector, deployFlipper, itWeb3, SponsoringMode, transferBalanceToEth} from './util/helpers';1920describe('EVM sponsoring', () => {21 itWeb3('Fee is deducted from contract if sponsoring is enabled', async ({api, web3, privateKeyWrapper}) => {22 const alice = privateKeyWrapper('//Alice');2324 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);25 const caller = createEthAccount(web3);26 const originalCallerBalance = await web3.eth.getBalance(caller);27 expect(originalCallerBalance).to.be.equal('0');2829 const flipper = await deployFlipper(web3, owner);3031 const helpers = contractHelpers(web3, owner);32 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});33 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});3435 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;36 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});37 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});38 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;3940 await transferBalanceToEth(api, alice, flipper.options.address);4142 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);43 expect(originalFlipperBalance).to.be.not.equal('0');4445 await flipper.methods.flip().send({from: caller});46 expect(await flipper.methods.getValue().call()).to.be.true;4748 // Balance should be taken from flipper instead of caller49 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);50 expect(await web3.eth.getBalance(flipper.options.address)).to.be.not.equals(originalFlipperBalance);51 });52 itWeb3('...but this doesn\'t applies to payable value', async ({api, web3, privateKeyWrapper}) => {53 const alice = privateKeyWrapper('//Alice');5455 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);56 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);57 const originalCallerBalance = await web3.eth.getBalance(caller);58 expect(originalCallerBalance).to.be.not.equal('0');5960 const collector = await deployCollector(web3, owner);6162 const helpers = contractHelpers(web3, owner);63 await helpers.methods.toggleAllowlist(collector.options.address, true).send({from: owner});64 await helpers.methods.toggleAllowed(collector.options.address, caller, true).send({from: owner});6566 expect(await helpers.methods.sponsoringEnabled(collector.options.address).call()).to.be.false;67 await helpers.methods.setSponsoringMode(collector.options.address, SponsoringMode.Allowlisted).send({from: owner});68 await helpers.methods.setSponsoringRateLimit(collector.options.address, 0).send({from: owner});69 expect(await helpers.methods.sponsoringEnabled(collector.options.address).call()).to.be.true;7071 await transferBalanceToEth(api, alice, collector.options.address);7273 const originalCollectorBalance = await web3.eth.getBalance(collector.options.address);74 expect(originalCollectorBalance).to.be.not.equal('0');7576 await collector.methods.giveMoney().send({from: caller, value: '10000'});7778 // Balance will be taken from both caller (value) and from collector (fee)79 expect(await web3.eth.getBalance(caller)).to.be.equals((BigInt(originalCallerBalance) - 10000n).toString());80 expect(await web3.eth.getBalance(collector.options.address)).to.be.not.equals(originalCollectorBalance);81 expect(await collector.methods.getCollected().call()).to.be.equal('10000');82 });83});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 {expect} from 'chai';18import {contractHelpers, createEthAccount, createEthAccountWithBalance, deployCollector, deployFlipper, itWeb3, SponsoringMode} from './util/helpers';1920describe('EVM sponsoring', () => {21 itWeb3('Fee is deducted from contract if sponsoring is enabled', async ({api, web3, privateKeyWrapper}) => {22 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);23 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);24 const caller = createEthAccount(web3);25 const originalCallerBalance = await web3.eth.getBalance(caller);26 expect(originalCallerBalance).to.be.equal('0');2728 const flipper = await deployFlipper(web3, owner);2930 const helpers = contractHelpers(web3, owner);31 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});32 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});33 34 await helpers.methods.setSponsor(flipper.options.address, sponsor).send({from: owner});35 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});3637 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;38 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});39 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});40 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;4142 const originalSponsorBalance = await web3.eth.getBalance(sponsor);43 expect(originalSponsorBalance).to.be.not.equal('0');4445 await flipper.methods.flip().send({from: caller});46 expect(await flipper.methods.getValue().call()).to.be.true;4748 // Balance should be taken from flipper instead of caller49 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);50 expect(await web3.eth.getBalance(sponsor)).to.be.not.equals(originalSponsorBalance);51 });5253 itWeb3('...but this doesn\'t applies to payable value', async ({api, web3, privateKeyWrapper}) => {54 const alice = privateKeyWrapper('//Alice');5556 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);57 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);58 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);59 const originalCallerBalance = await web3.eth.getBalance(caller);60 expect(originalCallerBalance).to.be.not.equal('0');6162 const collector = await deployCollector(web3, owner);6364 const helpers = contractHelpers(web3, owner);65 await helpers.methods.toggleAllowlist(collector.options.address, true).send({from: owner});66 await helpers.methods.toggleAllowed(collector.options.address, caller, true).send({from: owner});6768 expect(await helpers.methods.sponsoringEnabled(collector.options.address).call()).to.be.false;69 await helpers.methods.setSponsoringMode(collector.options.address, SponsoringMode.Allowlisted).send({from: owner});70 await helpers.methods.setSponsoringRateLimit(collector.options.address, 0).send({from: owner});71 expect(await helpers.methods.sponsoringEnabled(collector.options.address).call()).to.be.true;7273 await helpers.methods.setSponsor(collector.options.address, sponsor).send({from: owner});74 await helpers.methods.confirmSponsorship(collector.options.address).send({from: sponsor});7576 const originalSponsorBalance = await web3.eth.getBalance(sponsor);77 expect(originalSponsorBalance).to.be.not.equal('0');7879 await collector.methods.giveMoney().send({from: caller, value: '10000'});8081 // Balance will be taken from both caller (value) and from collector (fee)82 expect(await web3.eth.getBalance(caller)).to.be.equals((BigInt(originalCallerBalance) - 10000n).toString());83 expect(await web3.eth.getBalance(sponsor)).to.be.not.equals(originalSponsorBalance);84 expect(await collector.methods.getCollected().call()).to.be.equal('10000');85 });86});