Skip to content

Commit ce5fcc1

Browse files
leviadamleviadam
authored
Merge pull request #538 from daostack/bump_v_53
Use infra 0.0.0-alpha.06
2 parents 98ce362 + 8967699 commit ce5fcc1

12 files changed

+38
-45
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@daostack/arc",
3-
"version": "0.0.0-alpha.52",
3+
"version": "0.0.0-alpha.53",
44
"description": "A platform for building DAOs",
55
"files": [
66
"contracts/",
@@ -81,7 +81,7 @@
8181
},
8282
"homepage": "https://daostack.io",
8383
"dependencies": {
84-
"@daostack/infra": "^0.0.0-alpha.05",
84+
"@daostack/infra": "^0.0.0-alpha.06",
8585
"ethereumjs-abi": "^0.6.5",
8686
"openzeppelin-solidity": "1.12.0"
8787
},

‎test/auction4reputation.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ contract('Auction4Reputation', accounts => {
180180
assert.equal(tx.logs[0].event,"Redeem");
181181
assert.equal(tx.logs[0].args._amount,100);
182182
assert.equal(tx.logs[0].args._beneficiary,accounts[0]);
183-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100);
183+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100);
184184
});
185185

186186
it("redeem score ", async () => {
@@ -194,8 +194,8 @@ contract('Auction4Reputation', accounts => {
194194
await helpers.increaseTime(3001);
195195
await testSetup.auction4Reputation.redeem(accounts[0],id1);
196196
await testSetup.auction4Reputation.redeem(accounts[1],id2);
197-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25);
198-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[1]),75);
197+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25);
198+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[1]),75);
199199
});
200200

201201
it("redeem cannot redeem twice", async () => {
@@ -248,7 +248,7 @@ contract('Auction4Reputation', accounts => {
248248
await testSetup.auction4Reputation.redeem(accounts[0],id1);
249249
await testSetup.auction4Reputation.redeem(accounts[0],id2);
250250
await testSetup.auction4Reputation.redeem(accounts[0],id3);
251-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+300);
251+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+300);
252252
});
253253

254254
it("bid twice on the same auction", async () => {

‎test/contributionreward.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ contract('ContributionReward', accounts => {
209209
assert.equal(tx.logs.length, 1);
210210
assert.equal(tx.logs[0].event, "RedeemReputation");
211211
assert.equal(tx.logs[0].args._amount, reputationReward);
212-
var rep = await testSetup.org.reputation.reputationOf(accounts[1]);
212+
var rep = await testSetup.org.reputation.balanceOf(accounts[1]);
213213
assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward);
214214
});
215215

@@ -446,7 +446,7 @@ contract('ContributionReward', accounts => {
446446
assert.equal(tx.logs.length, 1);
447447
assert.equal(tx.logs[0].event, "RedeemReputation");
448448
assert.equal(tx.logs[0].args._amount, reputationReward);
449-
var rep = await testSetup.org.reputation.reputationOf(accounts[0]);
449+
var rep = await testSetup.org.reputation.balanceOf(accounts[0]);
450450
assert.equal(rep.toNumber(),testSetup.reputationArray[0]+reputationReward);
451451
});
452452

@@ -541,9 +541,9 @@ contract('ContributionReward', accounts => {
541541

542542
var eth = await web3.eth.getBalance(otherAvatar.address);
543543
assert.equal(eth,ethReward);
544-
assert.equal(await testSetup.org.reputation.reputationOf(otherAvatar.address),reputationReward);
544+
assert.equal(await testSetup.org.reputation.balanceOf(otherAvatar.address),reputationReward);
545545
assert.equal(await testSetup.org.token.balanceOf(otherAvatar.address),nativeTokenReward);
546-
var reputation = await testSetup.org.reputation.reputationOf(accounts[0]);
546+
var reputation = await testSetup.org.reputation.balanceOf(accounts[0]);
547547
var reputationGainAsVoter = 0;
548548
var proposingRepRewardConstA=60;
549549
var proposingRepRewardConstB=1;
@@ -576,9 +576,9 @@ contract('ContributionReward', accounts => {
576576
await arcUtils.redeem(proposalId,testSetup.org.avatar.address,accounts[0]);
577577
var eth = await web3.eth.getBalance(otherAvatar.address);
578578
assert.equal(eth,0);
579-
assert.equal(await testSetup.org.reputation.reputationOf(otherAvatar.address),0);
579+
assert.equal(await testSetup.org.reputation.balanceOf(otherAvatar.address),0);
580580
assert.equal(await testSetup.org.token.balanceOf(otherAvatar.address),0);
581-
var reputation = await testSetup.org.reputation.reputationOf(accounts[0]);
581+
var reputation = await testSetup.org.reputation.balanceOf(accounts[0]);
582582
//no reputation reward for proposer for negative proposal.
583583
//reputation reward for a single voter = 0
584584
assert.equal(reputation, 1000);
@@ -617,12 +617,12 @@ contract('ContributionReward', accounts => {
617617
assert.equal(tx.logs.length, 1);
618618
assert.equal(tx.logs[0].event, "RedeemReputation");
619619
assert.equal(tx.logs[0].args._amount, reputationReward);
620-
var rep = await testSetup.org.reputation.reputationOf(accounts[1]);
620+
var rep = await testSetup.org.reputation.balanceOf(accounts[1]);
621621
assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward);
622622
//try to redeem again.
623623
tx = await testSetup.contributionReward.redeem(proposalId,testSetup.org.avatar.address,[true,false,false,false]);
624624
assert.equal(tx.logs.length, 0);
625-
rep = await testSetup.org.reputation.reputationOf(accounts[1]);
625+
rep = await testSetup.org.reputation.balanceOf(accounts[1]);
626626
assert.equal(rep.toNumber(),testSetup.reputationArray[1]+reputationReward);
627627
});
628628
});

‎test/controller.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ contract('Controller', accounts => {
7272
assert.equal(tx.logs[0].event, "MintReputation");
7373
assert.equal(tx.logs[0].args._amount, amountToMint);
7474
assert.equal(tx.logs[0].args._to, accounts[0]);
75-
let rep = await reputation.reputationOf(accounts[0]);
75+
let rep = await reputation.balanceOf(accounts[0]);
7676
assert.equal(rep,amountToMint);
7777
});
7878

@@ -85,7 +85,7 @@ contract('Controller', accounts => {
8585
assert.equal(tx.logs[0].event, "BurnReputation");
8686
assert.equal(tx.logs[0].args._amount, amountToMint-1);
8787
assert.equal(tx.logs[0].args._from, accounts[0]);
88-
let rep = await reputation.reputationOf(accounts[0]);
88+
let rep = await reputation.balanceOf(accounts[0]);
8989
assert.equal(rep,1);
9090
});
9191

@@ -487,7 +487,7 @@ contract('Controller', accounts => {
487487
assert.equal(tx.logs[0].event, "MintReputation");
488488
assert.equal(tx.logs[0].args._amount, amountToMint);
489489
assert.equal(tx.logs[0].args._to, accounts[0]);
490-
let rep = await reputation.reputationOf(accounts[0]);
490+
let rep = await reputation.balanceOf(accounts[0]);
491491
assert.equal(rep,amountToMint);
492492
});
493493
it("globalConstraints register schemes add & remove", async () => {

‎test/daocreator.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ contract('DaoCreator', function(accounts) {
4242
await setup(accounts,10,10);
4343
var founderBalance = await token.balanceOf(accounts[0]);
4444
assert.equal(founderBalance,10);
45-
var founderReputation = await reputation.reputationOf(accounts[0]);
45+
var founderReputation = await reputation.balanceOf(accounts[0]);
4646
assert.equal(founderReputation,10);
4747
});
4848

@@ -176,7 +176,7 @@ contract('DaoCreator', function(accounts) {
176176
await setup(accounts,10,10,true);
177177
var founderBalance = await token.balanceOf(accounts[0]);
178178
assert.equal(founderBalance,10);
179-
var founderReputation = await reputation.reputationOf(accounts[0]);
179+
var founderReputation = await reputation.balanceOf(accounts[0]);
180180
assert.equal(founderReputation,10);
181181
});
182182

@@ -330,7 +330,7 @@ contract('DaoCreator', function(accounts) {
330330
}
331331

332332
await daoCreator.addFounders(avatar.address,foundersArray,founderReputation,founderToken,{gas:constants.ARC_GAS_LIMIT});
333-
var rep = await reputation.reputationOf(accounts[1]);
333+
var rep = await reputation.balanceOf(accounts[1]);
334334
assert.equal(rep.toNumber(),numberOfFounders);
335335
var founderBalance = await token.balanceOf(accounts[1]);
336336
assert.equal(founderBalance.toNumber(),numberOfFounders);

‎test/externallocking4reputation.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ contract('ExternalLocking4Reputation', accounts => {
118118
assert.equal(tx.logs[0].args._lockingId,lockingId);
119119
assert.equal(tx.logs[0].args._amount,100);
120120
assert.equal(tx.logs[0].args._beneficiary,accounts[0]);
121-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100);
121+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100);
122122
});
123123

124124
it("redeem score ", async () => {
@@ -130,8 +130,8 @@ contract('ExternalLocking4Reputation', accounts => {
130130
await helpers.increaseTime(3001);
131131
await testSetup.externalLocking4Reputation.redeem(accounts[0],lockingId1);
132132
await testSetup.externalLocking4Reputation.redeem(accounts[2],lockingId2);
133-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25);
134-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[2]),75);
133+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25);
134+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[2]),75);
135135
});
136136

137137
it("redeem cannot redeem twice", async () => {

‎test/fixreputationallocation.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ contract('FixedReputationAllocation', accounts => {
6767
assert.equal(tx.logs[0].event,"Redeem");
6868
beneficiaryReward = await testSetup.fixedReputationAllocation.beneficiaryReward();
6969
assert.equal(tx.logs[0].args._amount,beneficiaryReward.toNumber());
70-
reputation = await testSetup.org.reputation.reputationOf(accounts[i]);
70+
reputation = await testSetup.org.reputation.balanceOf(accounts[i]);
7171
assert.equal(reputation.toNumber(),tx.logs[0].args._amount);
7272
}
7373
});

‎test/globalconstraintregistrar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ contract('GlobalConstraintRegistrar', accounts => {
252252
globalConstraintMock.address,
253253
);
254254
proposalId = await helpers.getValueFromLogs(tx, '_proposalId',1);
255-
var rep = await testSetup.org.reputation.reputationOf(accounts[2]);
255+
var rep = await testSetup.org.reputation.balanceOf(accounts[2]);
256256

257257
await testSetup.globalConstraintRegistrarParams.votingMachine.genesisProtocol.vote(proposalId,1,0,{from:accounts[2]});
258258
await helpers.checkVoteInfo(testSetup.globalConstraintRegistrarParams.votingMachine.genesisProtocol,proposalId,accounts[2],[1,rep.toNumber()]);

‎test/lockingeth4reputation.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ contract('LockingEth4Reputation', accounts => {
163163
assert.equal(tx.logs[0].args._lockingId,lockingId);
164164
assert.equal(tx.logs[0].args._amount,100);
165165
assert.equal(tx.logs[0].args._beneficiary,accounts[0]);
166-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+100);
166+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+100);
167167
});
168168

169169
it("redeem score ", async () => {
@@ -175,8 +175,8 @@ contract('LockingEth4Reputation', accounts => {
175175
await helpers.increaseTime(3001);
176176
await testSetup.lockingEth4Reputation.redeem(accounts[0],lockingId1);
177177
await testSetup.lockingEth4Reputation.redeem(accounts[1],lockingId2);
178-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[0]),1000+25);
179-
assert.equal(await testSetup.org.reputation.reputationOf(accounts[1]),75);
178+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[0]),1000+25);
179+
assert.equal(await testSetup.org.reputation.balanceOf(accounts[1]),75);
180180
});
181181

182182
it("redeem cannot redeem twice", async () => {

0 commit comments

Comments
 (0)