Skip to content

Use infra 0.0.0-alpha.06 #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leviadam merged 1 commit into from
Sep 20, 2018
Merged

Use infra 0.0.0-alpha.06 #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/",
Expand Down Expand Up @@ -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"
},
Expand Down
8 changes: 4 additions & 4 deletions test/auction4reputation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down Expand Up @@ -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 () => {
Expand Down
16 changes: 8 additions & 8 deletions test/contributionreward.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
});
});
6 changes: 3 additions & 3 deletions test/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand All @@ -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);
});

Expand Down Expand Up @@ -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 () => {
Expand Down
6 changes: 3 additions & 3 deletions test/daocreator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions test/externallocking4reputation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion test/fixreputationallocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});
Expand Down
2 changes: 1 addition & 1 deletion test/globalconstraintregistrar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()]);
Expand Down
6 changes: 3 additions & 3 deletions test/lockingeth4reputation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down
6 changes: 3 additions & 3 deletions test/lockingtoken4reputation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down
6 changes: 3 additions & 3 deletions test/ucontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand All @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down