Skip to content

Commit f7e531e

Browse files
elenadimitrovaelenadimitrova
committed
Due to dapphub/ds-note#4 removed DSToken from tests and instead use instances of our own Token
1 parent e0dd9a0 commit f7e531e

14 files changed

+75
-46
lines changed

‎helpers/test-data-generator.js

+1
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ export async function setupColonyNetwork() {
402402
export async function setupRandomColony(colonyNetwork) {
403403
const tokenArgs = getTokenArgs();
404404
const token = await Token.new(...tokenArgs);
405+
await token.unlock();
405406

406407
const { logs } = await colonyNetwork.createColony(token.address);
407408
const { colonyAddress } = logs[0].args;

‎test-gas-costs/gasCosts.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
import ReputationMinerTestWrapper from "../packages/reputation-miner/test/ReputationMinerTestWrapper";
4747
import MaliciousReputationMinerExtraRep from "../packages/reputation-miner/test/MaliciousReputationMinerExtraRep";
4848

49-
const DSToken = artifacts.require("DSToken");
49+
const Token = artifacts.require("Token");
5050
const IColony = artifacts.require("IColony");
5151
const IMetaColony = artifacts.require("IMetaColony");
5252
const IColonyNetwork = artifacts.require("IColonyNetwork");
@@ -88,7 +88,8 @@ contract("All", function(accounts) {
8888
await IColony.defaults({ gasPrice });
8989

9090
const otherTokenArgs = getTokenArgs();
91-
otherToken = await DSToken.new(otherTokenArgs[1]);
91+
otherToken = await Token.new(...otherTokenArgs);
92+
await otherToken.unlock();
9293

9394
await fundColonyWithTokens(colony, token, INITIAL_FUNDING);
9495
});
@@ -97,7 +98,8 @@ contract("All", function(accounts) {
9798
describe("Gas costs", function() {
9899
it("when working with the Colony Network", async function() {
99100
const tokenArgs = getTokenArgs();
100-
const colonyToken = await DSToken.new(tokenArgs[1]);
101+
const colonyToken = await Token.new(...tokenArgs);
102+
await colonyToken.unlock();
101103
await colonyNetwork.createColony(colonyToken.address);
102104
});
103105

@@ -281,7 +283,8 @@ contract("All", function(accounts) {
281283
const managerReputation = WAD.muln(100);
282284

283285
const tokenArgs = getTokenArgs();
284-
const newToken = await DSToken.new(tokenArgs[1]);
286+
const newToken = await Token.new(...tokenArgs);
287+
await newToken.unlock();
285288
const { logs } = await colonyNetwork.createColony(newToken.address);
286289
const { colonyAddress } = logs[0].args;
287290
const newColony = await IColony.at(colonyAddress);

‎test-upgrade/colony-network-upgrade.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* eslint-disable prefer-arrow-callback */
33
import { getTokenArgs } from "../helpers/test-helper";
44

5-
const DSToken = artifacts.require("DSToken");
5+
const Token = artifacts.require("Token");
66
const IColonyNetwork = artifacts.require("IColonyNetwork");
77
const EtherRouter = artifacts.require("EtherRouter");
88
const Resolver = artifacts.require("Resolver");
@@ -20,12 +20,14 @@ contract("ColonyNetwork contract upgrade", function() {
2020

2121
// Setup 2 test colonies
2222
const tokenArgs1 = getTokenArgs();
23-
const newToken = await DSToken.new(tokenArgs1[1]);
23+
const newToken = await Token.new(...tokenArgs1);
24+
await newToken.unlock();
2425
let { logs } = await colonyNetwork.createColony(newToken.address);
2526
colonyAddress1 = logs[0].args.colonyAddress;
2627

2728
const tokenArgs2 = getTokenArgs();
28-
const newToken2 = await DSToken.new(tokenArgs2[1]);
29+
const newToken2 = await Token.new(...tokenArgs2);
30+
await newToken2.unlock();
2931
({ logs } = await colonyNetwork.createColony(newToken2.address));
3032
colonyAddress2 = logs[0].args.colonyAddress;
3133

‎test-upgrade/colony-upgrade.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const ColonyPayment = artifacts.require("ColonyPayment");
1515
const ColonyFunding = artifacts.require("ColonyFunding");
1616
const UpdatedColony = artifacts.require("UpdatedColony");
1717
const IUpdatedColony = artifacts.require("IUpdatedColony");
18-
const DSToken = artifacts.require("DSToken");
18+
const Token = artifacts.require("Token");
1919
const ContractRecovery = artifacts.require("ContractRecovery");
2020

2121
contract("Colony contract upgrade", accounts => {
@@ -43,7 +43,8 @@ contract("Colony contract upgrade", accounts => {
4343
dueDate = await currentBlockTime();
4444

4545
const tokenArgs = getTokenArgs();
46-
const colonyToken = await DSToken.new(tokenArgs[1]);
46+
const colonyToken = await Token.new(...tokenArgs);
47+
await colonyToken.unlock();
4748
const { logs } = await colonyNetwork.createColony(colonyToken.address);
4849
const { colonyAddress } = logs[0].args;
4950
colony = await IColony.at(colonyAddress);
@@ -52,7 +53,7 @@ contract("Colony contract upgrade", accounts => {
5253
colonyFunding = await ColonyFunding.new();
5354
contractRecovery = await ContractRecovery.new();
5455
const tokenAddress = await colony.getToken();
55-
token = await DSToken.at(tokenAddress);
56+
token = await Token.at(tokenAddress);
5657

5758
await makeTask({ colony, dueDate });
5859
await makeTask({ colony, dueDate: dueDate + 1, hash: SPECIFICATION_HASH_UPDATED });

‎test/colony-funding.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ chai.use(bnChai(web3.utils.BN));
3030

3131
const EtherRouter = artifacts.require("EtherRouter");
3232
const IColonyNetwork = artifacts.require("IColonyNetwork");
33-
const DSToken = artifacts.require("DSToken");
33+
const Token = artifacts.require("Token");
3434

3535
contract("Colony Funding", accounts => {
3636
const MANAGER = accounts[0];
@@ -51,7 +51,8 @@ contract("Colony Funding", accounts => {
5151
await colony.setRewardInverse(100);
5252

5353
const otherTokenArgs = getTokenArgs();
54-
otherToken = await DSToken.new(otherTokenArgs[0]);
54+
otherToken = await Token.new(...otherTokenArgs);
55+
await otherToken.unlock();
5556
});
5657

5758
describe("when receiving tokens", () => {

‎test/colony-network-auction.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const { expect } = chai;
1212
chai.use(bnChai(web3.utils.BN));
1313

1414
const DutchAuction = artifacts.require("DutchAuction");
15-
const DSToken = artifacts.require("DSToken");
15+
const Token = artifacts.require("Token");
1616

1717
contract("Colony Network Auction", accounts => {
1818
const BIDDER_1 = accounts[1];
@@ -42,7 +42,8 @@ contract("Colony Network Auction", accounts => {
4242
await colonyNetwork.startNextCycle();
4343

4444
const args = getTokenArgs();
45-
token = await DSToken.new(args[1]);
45+
token = await Token.new(...args);
46+
await token.unlock();
4647
await token.mint(colonyNetwork.address, quantity);
4748
const { logs, receipt } = await colonyNetwork.startTokenAuction(token.address);
4849
createAuctionTxReceipt = receipt;
@@ -77,7 +78,8 @@ contract("Colony Network Auction", accounts => {
7778

7879
it("should fail with zero quantity", async () => {
7980
const args = getTokenArgs();
80-
const otherToken = await DSToken.new(args[1]);
81+
const otherToken = await Token.new(...args);
82+
await otherToken.unlock();
8183
await checkErrorRevert(colonyNetwork.startTokenAuction(otherToken.address));
8284
});
8385

@@ -104,7 +106,8 @@ contract("Colony Network Auction", accounts => {
104106

105107
it("should set the minimum price correctly for quantity < 1e18", async () => {
106108
const args = getTokenArgs();
107-
const otherToken = await DSToken.new(args[1]);
109+
const otherToken = await Token.new(...args);
110+
await otherToken.unlock();
108111
await otherToken.mint(colonyNetwork.address, WAD.divn(10));
109112
const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
110113
const auctionAddress = logs[0].args.auction;
@@ -353,7 +356,8 @@ contract("Colony Network Auction", accounts => {
353356
let otherToken;
354357
beforeEach(async () => {
355358
const args = getTokenArgs();
356-
otherToken = await DSToken.new(args[1]);
359+
otherToken = await Token.new(...args);
360+
await otherToken.unlock();
357361
});
358362

359363
const auctionPropsLowQuantitiesLowPrice = [

‎test/colony-network.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const ENSRegistry = artifacts.require("ENSRegistry");
1616
const EtherRouter = artifacts.require("EtherRouter");
1717
const Resolver = artifacts.require("Resolver");
1818
const IColonyNetwork = artifacts.require("IColonyNetwork");
19-
const DSToken = artifacts.require("DSToken");
19+
const Token = artifacts.require("Token");
2020

2121
contract("Colony Network", accounts => {
2222
const SAMPLE_RESOLVER = "0x65a760e7441cf435086ae45e14a0c8fc1080f54c";
@@ -115,7 +115,8 @@ contract("Colony Network", accounts => {
115115
});
116116

117117
it("should maintain correct count of colonies", async () => {
118-
const token = await DSToken.new(getTokenArgs()[1]);
118+
const token = await Token.new(...getTokenArgs());
119+
await token.unlock();
119120
await colonyNetwork.createColony(token.address);
120121
await colonyNetwork.createColony(token.address);
121122
await colonyNetwork.createColony(token.address);
@@ -146,7 +147,7 @@ contract("Colony Network", accounts => {
146147
});
147148

148149
it("should fail to create meta colony if it already exists", async () => {
149-
const token = await DSToken.new(TOKEN_ARGS[1]);
150+
const token = await Token.new(...TOKEN_ARGS);
150151
await checkErrorRevert(colonyNetwork.createMetaColony(token.address), "colony-meta-colony-exists-already");
151152
});
152153

@@ -174,22 +175,22 @@ contract("Colony Network", accounts => {
174175
});
175176

176177
it("should fail if ETH is sent", async () => {
177-
const token = await DSToken.new(TOKEN_ARGS[1]);
178+
const token = await Token.new(...TOKEN_ARGS);
178179
await checkErrorRevert(colonyNetwork.createColony(token.address, { value: 1, gas: createColonyGas }));
179180

180181
const colonyNetworkBalance = await web3GetBalance(colonyNetwork.address);
181182
expect(colonyNetworkBalance).to.be.zero;
182183
});
183184

184185
it("should log a ColonyAdded event", async () => {
185-
const token = await DSToken.new(TOKEN_ARGS[1]);
186+
const token = await Token.new(...TOKEN_ARGS);
186187
await expectEvent(colonyNetwork.createColony(token.address), "ColonyAdded");
187188
});
188189
});
189190

190191
describe("when getting existing colonies", () => {
191192
it("should allow users to get the address of a colony by its index", async () => {
192-
const token = await DSToken.new(TOKEN_ARGS[1]);
193+
const token = await Token.new(...TOKEN_ARGS);
193194
await colonyNetwork.createColony(token.address);
194195
await colonyNetwork.createColony(token.address);
195196
await colonyNetwork.createColony(token.address);

‎test/colony-payment.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ chai.use(bnChai(web3.utils.BN));
1414
const EtherRouter = artifacts.require("EtherRouter");
1515
const IColonyNetwork = artifacts.require("IColonyNetwork");
1616
const IMetaColony = artifacts.require("IMetaColony");
17-
const DSToken = artifacts.require("DSToken");
17+
const Token = artifacts.require("Token");
1818

1919
contract("Colony Payment", accounts => {
2020
const RECIPIENT = accounts[3];
@@ -38,7 +38,8 @@ contract("Colony Payment", accounts => {
3838
await fundColonyWithTokens(colony, token, WAD.muln(20));
3939

4040
const tokenArgs = getTokenArgs();
41-
otherToken = await DSToken.new(tokenArgs[1]);
41+
otherToken = await Token.new(...tokenArgs);
42+
await otherToken.unlock();
4243
});
4344

4445
describe("when adding payments", () => {

‎test/colony-reward-payouts.js

+21-11
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const IColony = artifacts.require("IColony");
3232
const IMetaColony = artifacts.require("IMetaColony");
3333
const IColonyNetwork = artifacts.require("IColonyNetwork");
3434
const ITokenLocking = artifacts.require("ITokenLocking");
35-
const DSToken = artifacts.require("DSToken");
35+
const Token = artifacts.require("Token");
3636
const DSRoles = artifacts.require("DSRoles");
3737

3838
const contractLoader = new TruffleLoader({
@@ -75,7 +75,8 @@ contract("Colony Reward Payouts", accounts => {
7575
await colony.setRewardInverse(100);
7676

7777
const otherTokenArgs = getTokenArgs();
78-
otherToken = await DSToken.new(otherTokenArgs[0]);
78+
otherToken = await Token.new(...otherTokenArgs);
79+
await otherToken.unlock();
7980

8081
await fundColonyWithTokens(colony, otherToken, initialFunding);
8182
await colony.mintTokens(initialFunding.muln(100).divn(99)); // Tke in to account 1% being siphoned off for rewards
@@ -144,7 +145,8 @@ contract("Colony Reward Payouts", accounts => {
144145

145146
it("should not be able to create reward payout if passed reputation is not from the correct colony", async () => {
146147
const tokenArgs = getTokenArgs();
147-
const newToken = await DSToken.new(tokenArgs[1]);
148+
const newToken = await Token.new(...tokenArgs);
149+
await newToken.unlock();
148150
const { logs } = await colonyNetwork.createColony(newToken.address);
149151
const { colonyAddress } = logs[0].args;
150152
const newColony = await IColony.at(colonyAddress);
@@ -262,7 +264,8 @@ contract("Colony Reward Payouts", accounts => {
262264

263265
it("should not be able to start a reward payout if no one holds colony tokens", async () => {
264266
const tokenArgs = getTokenArgs();
265-
const newToken = await DSToken.new(tokenArgs[1]);
267+
const newToken = await Token.new(...tokenArgs);
268+
await newToken.unlock();
266269
const { logs } = await colonyNetwork.createColony(newToken.address);
267270
const { colonyAddress } = logs[0].args;
268271
const newColony = await IColony.at(colonyAddress);
@@ -298,7 +301,8 @@ contract("Colony Reward Payouts", accounts => {
298301

299302
it("should be able to collect rewards from multiple payouts of different token", async () => {
300303
const tokenArgs = getTokenArgs();
301-
const newToken = await DSToken.new(tokenArgs[1]);
304+
const newToken = await Token.new(...tokenArgs);
305+
await newToken.unlock();
302306
await fundColonyWithTokens(colony, newToken, initialFunding);
303307

304308
const tx1 = await colony.startNextRewardPayout(newToken.address, ...colonyWideReputationProof);
@@ -313,7 +317,8 @@ contract("Colony Reward Payouts", accounts => {
313317

314318
it("should not be able to claim payout if colony-wide reputation is 0", async () => {
315319
const tokenArgs = getTokenArgs();
316-
const newToken = await DSToken.new(tokenArgs[1]);
320+
const newToken = await Token.new(...tokenArgs);
321+
await newToken.unlock();
317322
const { logs } = await colonyNetwork.createColony(newToken.address);
318323
const { colonyAddress } = logs[0].args;
319324
const newColony = await IColony.at(colonyAddress);
@@ -456,7 +461,8 @@ contract("Colony Reward Payouts", accounts => {
456461

457462
it("should not be able to claim funds if previous payout is not claimed", async () => {
458463
const tokenArgs = getTokenArgs();
459-
const newToken = await DSToken.new(tokenArgs[1]);
464+
const newToken = await Token.new(...tokenArgs);
465+
await newToken.unlock();
460466
await fundColonyWithTokens(colony, newToken, initialFunding);
461467

462468
await colony.startNextRewardPayout(otherToken.address, ...colonyWideReputationProof);
@@ -559,7 +565,8 @@ contract("Colony Reward Payouts", accounts => {
559565
it("should be able to collect payout from two colonies at the same time", async () => {
560566
// Setting up a new token and two colonies
561567
const tokenArgs = getTokenArgs();
562-
const newToken = await DSToken.new(tokenArgs[1]);
568+
const newToken = await Token.new(...tokenArgs);
569+
await newToken.unlock();
563570

564571
let { logs } = await colonyNetwork.createColony(newToken.address);
565572
let { colonyAddress } = logs[0].args;
@@ -676,7 +683,8 @@ contract("Colony Reward Payouts", accounts => {
676683
it("should not be able to claim reward payout from a colony that didn't create it", async () => {
677684
// Setting up a new token and two colonies
678685
const tokenArgs = getTokenArgs();
679-
const newToken = await DSToken.new(tokenArgs[1]);
686+
const newToken = await Token.new(...tokenArgs);
687+
await newToken.unlock();
680688

681689
let { logs } = await colonyNetwork.createColony(newToken.address);
682690
let { colonyAddress } = logs[0].args;
@@ -815,14 +823,16 @@ contract("Colony Reward Payouts", accounts => {
815823
total reputation/tokens: ${data.totalReputation.toString()}`, async () => {
816824
// Setting up a new token and colony
817825
const tokenArgs = getTokenArgs();
818-
const newToken = await DSToken.new(tokenArgs[1]);
826+
const newToken = await Token.new(...tokenArgs);
827+
await newToken.unlock();
819828
let { logs } = await colonyNetwork.createColony(newToken.address);
820829
const { colonyAddress } = logs[0].args;
821830
await newToken.setOwner(colonyAddress);
822831
const newColony = await IColony.at(colonyAddress);
823832

824833
const payoutTokenArgs = getTokenArgs();
825-
const payoutToken = await DSToken.new(payoutTokenArgs[0]);
834+
const payoutToken = await Token.new(...payoutTokenArgs);
835+
await payoutToken.unlock();
826836
await fundColonyWithTokens(newColony, payoutToken, data.totalAmountOfPayoutTokens);
827837
// Issuing colony's internal tokens so they can be given to users in `bootstrapColony`
828838
await newColony.mintTokens(data.totalReputation);

‎test/colony-task.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ chai.use(bnChai(web3.utils.BN));
6262
const EtherRouter = artifacts.require("EtherRouter");
6363
const IMetaColony = artifacts.require("IMetaColony");
6464
const IColonyNetwork = artifacts.require("IColonyNetwork");
65-
const DSToken = artifacts.require("DSToken");
65+
const Token = artifacts.require("Token");
6666
const TaskSkillEditing = artifacts.require("TaskSkillEditing");
6767

6868
contract("ColonyTask", accounts => {
@@ -89,7 +89,8 @@ contract("ColonyTask", accounts => {
8989
await colony.setAdministrationRole(1, 0, COLONY_ADMIN, 1, true);
9090

9191
const otherTokenArgs = getTokenArgs();
92-
otherToken = await DSToken.new(otherTokenArgs[1]);
92+
otherToken = await Token.new(...otherTokenArgs);
93+
await otherToken.unlock();
9394
});
9495

9596
describe("when creating tasks", () => {

‎test/colony.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { makeTask, setupColonyNetwork, setupMetaColonyWithLockedCLNYToken, setup
2020
const { expect } = chai;
2121
chai.use(bnChai(web3.utils.BN));
2222

23-
const DSToken = artifacts.require("DSToken");
23+
const Token = artifacts.require("Token");
2424
const IReputationMiningCycle = artifacts.require("IReputationMiningCycle");
2525

2626
contract("Colony", accounts => {
@@ -71,7 +71,8 @@ contract("Colony", accounts => {
7171

7272
it("should emit correct Mint event when minting tokens", async () => {
7373
const tokenArgs = getTokenArgs();
74-
const otherToken = await DSToken.new(tokenArgs[1]);
74+
const otherToken = await Token.new(...tokenArgs);
75+
await otherToken.unlock();
7576

7677
await expectAllEvents(otherToken.methods["mint(uint256)"](100), ["Mint"]);
7778
});

0 commit comments

Comments
 (0)