From 896769927f41b3ea6ee90d3180443fb9c4f9a11a Mon Sep 17 00:00:00 2001 From: Oren Date: Thu, 20 Sep 2018 08:21:08 +0300 Subject: [PATCH] Use infra 0.0.0-alpha.06 Bump version to 0.0.0-alpha.53 --- package-lock.json | 15 ++++----------- package.json | 4 ++-- test/auction4reputation.js | 8 ++++---- test/contributionreward.js | 16 ++++++++-------- test/controller.js | 6 +++--- test/daocreator.js | 6 +++--- test/externallocking4reputation.js | 6 +++--- test/fixreputationallocation.js | 2 +- test/globalconstraintregistrar.js | 2 +- test/lockingeth4reputation.js | 6 +++--- test/lockingtoken4reputation.js | 6 +++--- test/ucontroller.js | 6 +++--- 12 files changed, 38 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 827ec5fe..23a79893 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc", - "version": "0.0.0-alpha.52", + "version": "0.0.0-alpha.53", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -161,19 +161,12 @@ } }, "@daostack/infra": { - "version": "0.0.0-alpha.5", - "resolved": "https://registry.npmjs.org/@daostack/infra/-/infra-0.0.0-alpha.5.tgz", - "integrity": "sha512-ls04MXGc7SCHVeNPE91v+4Bqyi9iQDKjeXOsScd3skSOU+XvEzbIqohQSqpQgrth9GRNg+B0dqrRwGRfz30WYA==", + "version": "0.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/@daostack/infra/-/infra-0.0.0-alpha.6.tgz", + "integrity": "sha512-9XqySiviym4qn2MSpN9rlgLdYoW7B0xCLPI+pfW5qCQoWUJbJOPzhPO9qtEkbBGctB2Yy3WRpGlBP5H0e6G8kA==", "requires": { "ethereumjs-abi": "^0.6.5", "openzeppelin-solidity": "1.12.0" - }, - "dependencies": { - "openzeppelin-solidity": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/openzeppelin-solidity/-/openzeppelin-solidity-1.12.0.tgz", - "integrity": "sha512-WlorzMXIIurugiSdw121RVD5qA3EfSI7GybTn+/Du0mPNgairjt29NpVTAaH8eLjAeAwlw46y7uQKy0NYem/gA==" - } } }, "@soldoc/markdown": { diff --git a/package.json b/package.json index 927605ac..b92ada99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@daostack/arc", - "version": "0.0.0-alpha.52", + "version": "0.0.0-alpha.53", "description": "A platform for building DAOs", "files": [ "contracts/", @@ -81,7 +81,7 @@ }, "homepage": "https://daostack.io", "dependencies": { - "@daostack/infra": "^0.0.0-alpha.05", + "@daostack/infra": "^0.0.0-alpha.06", "ethereumjs-abi": "^0.6.5", "openzeppelin-solidity": "1.12.0" }, diff --git a/test/auction4reputation.js b/test/auction4reputation.js index 67b21b1a..88ae0074 100644 --- a/test/auction4reputation.js +++ b/test/auction4reputation.js @@ -180,7 +180,7 @@ contract('Auction4Reputation', accounts => { assert.equal(tx.logs[0].event,"Redeem"); assert.equal(tx.logs[0].args._amount,100); assert.equal(tx.logs[0].args._beneficiary,accounts[0]); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100); }); it("redeem score ", async () => { @@ -194,8 +194,8 @@ contract('Auction4Reputation', accounts => { await helpers.increaseTime(3001); await testSetup.auction4Reputation.redeem(accounts[0],id1); await testSetup.auction4Reputation.redeem(accounts[1],id2); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[1]),75); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[1]),75); }); it("redeem cannot redeem twice", async () => { @@ -248,7 +248,7 @@ contract('Auction4Reputation', accounts => { await testSetup.auction4Reputation.redeem(accounts[0],id1); await testSetup.auction4Reputation.redeem(accounts[0],id2); await testSetup.auction4Reputation.redeem(accounts[0],id3); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+300); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+300); }); it("bid twice on the same auction", async () => { diff --git a/test/contributionreward.js b/test/contributionreward.js index 014d770d..75f15506 100644 --- a/test/contributionreward.js +++ b/test/contributionreward.js @@ -209,7 +209,7 @@ contract('ContributionReward', accounts => { assert.equal(tx.logs.length, 1); assert.equal(tx.logs[0].event, "RedeemReputation"); assert.equal(tx.logs[0].args._amount, reputationReward); - var rep = await testSetup.org.reputation.reputationOf(accounts[1]); + var rep = await testSetup.org.reputation.balanceOf(accounts[1]); assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward); }); @@ -446,7 +446,7 @@ contract('ContributionReward', accounts => { assert.equal(tx.logs.length, 1); assert.equal(tx.logs[0].event, "RedeemReputation"); assert.equal(tx.logs[0].args._amount, reputationReward); - var rep = await testSetup.org.reputation.reputationOf(accounts[0]); + var rep = await testSetup.org.reputation.balanceOf(accounts[0]); assert.equal(rep.toNumber(),testSetup.reputationArray[0]+reputationReward); }); @@ -541,9 +541,9 @@ contract('ContributionReward', accounts => { var eth = await web3.eth.getBalance(otherAvatar.address); assert.equal(eth,ethReward); - assert.equal(await testSetup.org.reputation.reputationOf(otherAvatar.address),reputationReward); + assert.equal(await testSetup.org.reputation.balanceOf(otherAvatar.address),reputationReward); assert.equal(await testSetup.org.token.balanceOf(otherAvatar.address),nativeTokenReward); - var reputation = await testSetup.org.reputation.reputationOf(accounts[0]); + var reputation = await testSetup.org.reputation.balanceOf(accounts[0]); var reputationGainAsVoter = 0; var proposingRepRewardConstA=60; var proposingRepRewardConstB=1; @@ -576,9 +576,9 @@ contract('ContributionReward', accounts => { await arcUtils.redeem(proposalId,testSetup.org.avatar.address,accounts[0]); var eth = await web3.eth.getBalance(otherAvatar.address); assert.equal(eth,0); - assert.equal(await testSetup.org.reputation.reputationOf(otherAvatar.address),0); + assert.equal(await testSetup.org.reputation.balanceOf(otherAvatar.address),0); assert.equal(await testSetup.org.token.balanceOf(otherAvatar.address),0); - var reputation = await testSetup.org.reputation.reputationOf(accounts[0]); + var reputation = await testSetup.org.reputation.balanceOf(accounts[0]); //no reputation reward for proposer for negative proposal. //reputation reward for a single voter = 0 assert.equal(reputation, 1000); @@ -617,12 +617,12 @@ contract('ContributionReward', accounts => { assert.equal(tx.logs.length, 1); assert.equal(tx.logs[0].event, "RedeemReputation"); assert.equal(tx.logs[0].args._amount, reputationReward); - var rep = await testSetup.org.reputation.reputationOf(accounts[1]); + var rep = await testSetup.org.reputation.balanceOf(accounts[1]); assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward); //try to redeem again. tx = await testSetup.contributionReward.redeem(proposalId,testSetup.org.avatar.address,[true,false,false,false]); assert.equal(tx.logs.length, 0); - rep = await testSetup.org.reputation.reputationOf(accounts[1]); + rep = await testSetup.org.reputation.balanceOf(accounts[1]); assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward); }); }); diff --git a/test/controller.js b/test/controller.js index 54585bb5..52787b7e 100644 --- a/test/controller.js +++ b/test/controller.js @@ -72,7 +72,7 @@ contract('Controller', accounts => { assert.equal(tx.logs[0].event, "MintReputation"); assert.equal(tx.logs[0].args._amount, amountToMint); assert.equal(tx.logs[0].args._to, accounts[0]); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,amountToMint); }); @@ -85,7 +85,7 @@ contract('Controller', accounts => { assert.equal(tx.logs[0].event, "BurnReputation"); assert.equal(tx.logs[0].args._amount, amountToMint-1); assert.equal(tx.logs[0].args._from, accounts[0]); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,1); }); @@ -487,7 +487,7 @@ contract('Controller', accounts => { assert.equal(tx.logs[0].event, "MintReputation"); assert.equal(tx.logs[0].args._amount, amountToMint); assert.equal(tx.logs[0].args._to, accounts[0]); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,amountToMint); }); it("globalConstraints register schemes add & remove", async () => { diff --git a/test/daocreator.js b/test/daocreator.js index d11d034c..443ba11f 100644 --- a/test/daocreator.js +++ b/test/daocreator.js @@ -42,7 +42,7 @@ contract('DaoCreator', function(accounts) { await setup(accounts,10,10); var founderBalance = await token.balanceOf(accounts[0]); assert.equal(founderBalance,10); - var founderReputation = await reputation.reputationOf(accounts[0]); + var founderReputation = await reputation.balanceOf(accounts[0]); assert.equal(founderReputation,10); }); @@ -176,7 +176,7 @@ contract('DaoCreator', function(accounts) { await setup(accounts,10,10,true); var founderBalance = await token.balanceOf(accounts[0]); assert.equal(founderBalance,10); - var founderReputation = await reputation.reputationOf(accounts[0]); + var founderReputation = await reputation.balanceOf(accounts[0]); assert.equal(founderReputation,10); }); @@ -330,7 +330,7 @@ contract('DaoCreator', function(accounts) { } await daoCreator.addFounders(avatar.address,foundersArray,founderReputation,founderToken,{gas:constants.ARC_GAS_LIMIT}); - var rep = await reputation.reputationOf(accounts[1]); + var rep = await reputation.balanceOf(accounts[1]); assert.equal(rep.toNumber(),numberOfFounders); var founderBalance = await token.balanceOf(accounts[1]); assert.equal(founderBalance.toNumber(),numberOfFounders); diff --git a/test/externallocking4reputation.js b/test/externallocking4reputation.js index 49f1e852..bcb36f02 100644 --- a/test/externallocking4reputation.js +++ b/test/externallocking4reputation.js @@ -118,7 +118,7 @@ contract('ExternalLocking4Reputation', accounts => { assert.equal(tx.logs[0].args._lockingId,lockingId); assert.equal(tx.logs[0].args._amount,100); assert.equal(tx.logs[0].args._beneficiary,accounts[0]); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100); }); it("redeem score ", async () => { @@ -130,8 +130,8 @@ contract('ExternalLocking4Reputation', accounts => { await helpers.increaseTime(3001); await testSetup.externalLocking4Reputation.redeem(accounts[0],lockingId1); await testSetup.externalLocking4Reputation.redeem(accounts[2],lockingId2); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[2]),75); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[2]),75); }); it("redeem cannot redeem twice", async () => { diff --git a/test/fixreputationallocation.js b/test/fixreputationallocation.js index 1589cc16..e3b120a3 100644 --- a/test/fixreputationallocation.js +++ b/test/fixreputationallocation.js @@ -67,7 +67,7 @@ contract('FixedReputationAllocation', accounts => { assert.equal(tx.logs[0].event,"Redeem"); beneficiaryReward = await testSetup.fixedReputationAllocation.beneficiaryReward(); assert.equal(tx.logs[0].args._amount,beneficiaryReward.toNumber()); - reputation = await testSetup.org.reputation.reputationOf(accounts[i]); + reputation = await testSetup.org.reputation.balanceOf(accounts[i]); assert.equal(reputation.toNumber(),tx.logs[0].args._amount); } }); diff --git a/test/globalconstraintregistrar.js b/test/globalconstraintregistrar.js index a3f87408..c1b274c3 100644 --- a/test/globalconstraintregistrar.js +++ b/test/globalconstraintregistrar.js @@ -252,7 +252,7 @@ contract('GlobalConstraintRegistrar', accounts => { globalConstraintMock.address, ); proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1); - var rep = await testSetup.org.reputation.reputationOf(accounts[2]); + var rep = await testSetup.org.reputation.balanceOf(accounts[2]); await testSetup.globalConstraintRegistrarParams.votingMachine.genesisProtocol.vote(proposalId,1,0,{from:accounts[2]}); await helpers.checkVoteInfo(testSetup.globalConstraintRegistrarParams.votingMachine.genesisProtocol,proposalId,accounts[2],[1,rep.toNumber()]); diff --git a/test/lockingeth4reputation.js b/test/lockingeth4reputation.js index 448f336d..0fc42b46 100644 --- a/test/lockingeth4reputation.js +++ b/test/lockingeth4reputation.js @@ -163,7 +163,7 @@ contract('LockingEth4Reputation', accounts => { assert.equal(tx.logs[0].args._lockingId,lockingId); assert.equal(tx.logs[0].args._amount,100); assert.equal(tx.logs[0].args._beneficiary,accounts[0]); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100); }); it("redeem score ", async () => { @@ -175,8 +175,8 @@ contract('LockingEth4Reputation', accounts => { await helpers.increaseTime(3001); await testSetup.lockingEth4Reputation.redeem(accounts[0],lockingId1); await testSetup.lockingEth4Reputation.redeem(accounts[1],lockingId2); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[1]),75); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[1]),75); }); it("redeem cannot redeem twice", async () => { diff --git a/test/lockingtoken4reputation.js b/test/lockingtoken4reputation.js index 3b682c8b..490e773d 100644 --- a/test/lockingtoken4reputation.js +++ b/test/lockingtoken4reputation.js @@ -166,7 +166,7 @@ contract('LockingToken4Reputation', accounts => { assert.equal(tx.logs[0].args._lockingId,lockingId); assert.equal(tx.logs[0].args._amount,100); assert.equal(tx.logs[0].args._beneficiary,accounts[0]); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100); }); it("redeem score ", async () => { @@ -180,8 +180,8 @@ contract('LockingToken4Reputation', accounts => { await helpers.increaseTime(3001); await testSetup.lockingToken4Reputation.redeem(accounts[0],lockingId1); await testSetup.lockingToken4Reputation.redeem(accounts[1],lockingId2); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25); - assert.equal(await testSetup.org.reputation.reputationOf(accounts[1]),75); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25); + assert.equal(await testSetup.org.reputation.balanceOf(accounts[1]),75); }); it("redeem cannot redeem twice", async () => { diff --git a/test/ucontroller.js b/test/ucontroller.js index 9f6d7462..1ee46e3b 100644 --- a/test/ucontroller.js +++ b/test/ucontroller.js @@ -95,7 +95,7 @@ contract('UController',accounts => { assert.equal(tx.logs[0].event, "MintReputation"); assert.equal(tx.logs[0].args._amount, amountToMint); assert.equal(tx.logs[0].args._to, accounts[0]); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,amountToMint); }); @@ -108,7 +108,7 @@ contract('UController',accounts => { assert.equal(tx.logs[0].event, "BurnReputation"); assert.equal(tx.logs[0].args._amount, amountToMint-1); assert.equal(tx.logs[0].args._from, accounts[0]); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,1); }); @@ -503,7 +503,7 @@ contract('UController',accounts => { assert.equal(tx.logs.length, 1); assert.equal(tx.logs[0].event, "MintReputation"); assert.equal(tx.logs[0].args._amount, amountToMint); - let rep = await reputation.reputationOf(accounts[0]); + let rep = await reputation.balanceOf(accounts[0]); assert.equal(rep,amountToMint); });