kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

modify getBlockNumber() function

Browse Source
This commit is contained in:
haythem 2019-08-10 15:35:22 +01:00
parent c823bb977a
commit 2fc6850c52
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/contribution/test/contribution.js
View File

@ -1,3 +1,4 @@
const ethers = require('ethers');
const namehash = require('ethers').utils.namehash; const namehash = require('ethers').utils.namehash;
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -45,17 +46,9 @@ const mineBlock = function() {
}); });
}; };
const getBlockNumber = function() {
return new Promise((resolve, reject) => {
// eslint-disable-next-line no-undef
web3.eth.getBlockNumber(async (err, res) => {
if (err || !res) return reject(err);
resolve(res);
});
});
}
contract('Contribution app', (accounts) => { contract('Contribution app', (accounts) => {
// eslint-disable-next-line no-undef
let ethProvider = new ethers.providers.Web3Provider(web3.currentProvider);
let kernelBase, aclBase, daoFactory, r, dao, acl, contribution, token, contributor; let kernelBase, aclBase, daoFactory, r, dao, acl, contribution, token, contributor;
const root = accounts[0]; const root = accounts[0];
@ -242,8 +235,7 @@ contract('Contribution app', (accounts) => {
const contributionId = await contribution.contributionsCount(); const contributionId = await contribution.contributionsCount();
let contributionObject = await contribution.getContribution(contributionId.toNumber()); let contributionObject = await contribution.getContribution(contributionId.toNumber());
console.log("veto block: " + contributionObject[7]); console.log("veto block: " + contributionObject[7]);
console.log("current block: " + await getBlockNumber()); console.log("current block: " + await ethProvider.getBlockNumber());
await contribution.veto(contributionId.toNumber(), {from: root}); await contribution.veto(contributionId.toNumber(), {from: root});
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
assert(contributionObject[9], true); assert(contributionObject[9], true);
@ -291,7 +283,7 @@ contract('Contribution app', (accounts) => {
let contributionObject = await contribution.getContribution(contributionId.toNumber()); let contributionObject = await contribution.getContribution(contributionId.toNumber());
console.log("claim block: " + contributionObject[7]); console.log("claim block: " + contributionObject[7]);
console.log("current block: " + await getBlockNumber()); console.log("current block: " + await ethProvider.getBlockNumber());
await contribution.claim(contributionId); await contribution.claim(contributionId);
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef