Skip to content

Commit 9178b93

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 9178b93

12 files changed

+45
-45
lines changed

‎test-gas-costs/gasCosts.js

+4-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,7 @@ 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);
9292

9393
await fundColonyWithTokens(colony, token, INITIAL_FUNDING);
9494
});
@@ -97,7 +97,7 @@ contract("All", function(accounts) {
9797
describe("Gas costs", function() {
9898
it("when working with the Colony Network", async function() {
9999
const tokenArgs = getTokenArgs();
100-
const colonyToken = await DSToken.new(tokenArgs[1]);
100+
const colonyToken = await Token.new(tokenArgs);
101101
await colonyNetwork.createColony(colonyToken.address);
102102
});
103103

@@ -281,7 +281,7 @@ contract("All", function(accounts) {
281281
const managerReputation = WAD.muln(100);
282282

283283
const tokenArgs = getTokenArgs();
284-
const newToken = await DSToken.new(tokenArgs[1]);
284+
const newToken = await Token.new(tokenArgs);
285285
const { logs } = await colonyNetwork.createColony(newToken.address);
286286
const { colonyAddress } = logs[0].args;
287287
const newColony = await IColony.at(colonyAddress);

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

+3-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,12 @@ 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);
2424
let { logs } = await colonyNetwork.createColony(newToken.address);
2525
colonyAddress1 = logs[0].args.colonyAddress;
2626

2727
const tokenArgs2 = getTokenArgs();
28-
const newToken2 = await DSToken.new(tokenArgs2[1]);
28+
const newToken2 = await Token.new(tokenArgs2);
2929
({ logs } = await colonyNetwork.createColony(newToken2.address));
3030
colonyAddress2 = logs[0].args.colonyAddress;
3131

‎test-upgrade/colony-upgrade.js

+3-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,7 @@ 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);
4747
const { logs } = await colonyNetwork.createColony(colonyToken.address);
4848
const { colonyAddress } = logs[0].args;
4949
colony = await IColony.at(colonyAddress);
@@ -52,7 +52,7 @@ contract("Colony contract upgrade", accounts => {
5252
colonyFunding = await ColonyFunding.new();
5353
contractRecovery = await ContractRecovery.new();
5454
const tokenAddress = await colony.getToken();
55-
token = await DSToken.at(tokenAddress);
55+
token = await Token.at(tokenAddress);
5656

5757
await makeTask({ colony, dueDate });
5858
await makeTask({ colony, dueDate: dueDate + 1, hash: SPECIFICATION_HASH_UPDATED });

‎test/colony-funding.js

+2-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,7 @@ 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);
5555
});
5656

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

‎test/colony-network-auction.js

+5-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,7 @@ 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);
4646
await token.mint(colonyNetwork.address, quantity);
4747
const { logs, receipt } = await colonyNetwork.startTokenAuction(token.address);
4848
createAuctionTxReceipt = receipt;
@@ -77,7 +77,7 @@ contract("Colony Network Auction", accounts => {
7777

7878
it("should fail with zero quantity", async () => {
7979
const args = getTokenArgs();
80-
const otherToken = await DSToken.new(args[1]);
80+
const otherToken = await Token.new(args);
8181
await checkErrorRevert(colonyNetwork.startTokenAuction(otherToken.address));
8282
});
8383

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

105105
it("should set the minimum price correctly for quantity < 1e18", async () => {
106106
const args = getTokenArgs();
107-
const otherToken = await DSToken.new(args[1]);
107+
const otherToken = await Token.new(args);
108108
await otherToken.mint(colonyNetwork.address, WAD.divn(10));
109109
const { logs } = await colonyNetwork.startTokenAuction(otherToken.address);
110110
const auctionAddress = logs[0].args.auction;
@@ -353,7 +353,7 @@ contract("Colony Network Auction", accounts => {
353353
let otherToken;
354354
beforeEach(async () => {
355355
const args = getTokenArgs();
356-
otherToken = await DSToken.new(args[1]);
356+
otherToken = await Token.new(args);
357357
});
358358

359359
const auctionPropsLowQuantitiesLowPrice = [

‎test/colony-network.js

+6-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,7 @@ 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());
119119
await colonyNetwork.createColony(token.address);
120120
await colonyNetwork.createColony(token.address);
121121
await colonyNetwork.createColony(token.address);
@@ -146,7 +146,7 @@ contract("Colony Network", accounts => {
146146
});
147147

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

@@ -174,22 +174,22 @@ contract("Colony Network", accounts => {
174174
});
175175

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

180180
const colonyNetworkBalance = await web3GetBalance(colonyNetwork.address);
181181
expect(colonyNetworkBalance).to.be.zero;
182182
});
183183

184184
it("should log a ColonyAdded event", async () => {
185-
const token = await DSToken.new(TOKEN_ARGS[1]);
185+
const token = await Token.new(TOKEN_ARGS);
186186
await expectEvent(colonyNetwork.createColony(token.address), "ColonyAdded");
187187
});
188188
});
189189

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

‎test/colony-payment.js

+2-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,7 @@ 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);
4242
});
4343

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

‎test/colony-reward-payouts.js

+11-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,7 @@ 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);
7979

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

145145
it("should not be able to create reward payout if passed reputation is not from the correct colony", async () => {
146146
const tokenArgs = getTokenArgs();
147-
const newToken = await DSToken.new(tokenArgs[1]);
147+
const newToken = await Token.new(tokenArgs);
148148
const { logs } = await colonyNetwork.createColony(newToken.address);
149149
const { colonyAddress } = logs[0].args;
150150
const newColony = await IColony.at(colonyAddress);
@@ -262,7 +262,7 @@ contract("Colony Reward Payouts", accounts => {
262262

263263
it("should not be able to start a reward payout if no one holds colony tokens", async () => {
264264
const tokenArgs = getTokenArgs();
265-
const newToken = await DSToken.new(tokenArgs[1]);
265+
const newToken = await Token.new(tokenArgs);
266266
const { logs } = await colonyNetwork.createColony(newToken.address);
267267
const { colonyAddress } = logs[0].args;
268268
const newColony = await IColony.at(colonyAddress);
@@ -298,7 +298,7 @@ contract("Colony Reward Payouts", accounts => {
298298

299299
it("should be able to collect rewards from multiple payouts of different token", async () => {
300300
const tokenArgs = getTokenArgs();
301-
const newToken = await DSToken.new(tokenArgs[1]);
301+
const newToken = await Token.new(tokenArgs);
302302
await fundColonyWithTokens(colony, newToken, initialFunding);
303303

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

314314
it("should not be able to claim payout if colony-wide reputation is 0", async () => {
315315
const tokenArgs = getTokenArgs();
316-
const newToken = await DSToken.new(tokenArgs[1]);
316+
const newToken = await Token.new(tokenArgs);
317317
const { logs } = await colonyNetwork.createColony(newToken.address);
318318
const { colonyAddress } = logs[0].args;
319319
const newColony = await IColony.at(colonyAddress);
@@ -456,7 +456,7 @@ contract("Colony Reward Payouts", accounts => {
456456

457457
it("should not be able to claim funds if previous payout is not claimed", async () => {
458458
const tokenArgs = getTokenArgs();
459-
const newToken = await DSToken.new(tokenArgs[1]);
459+
const newToken = await Token.new(tokenArgs);
460460
await fundColonyWithTokens(colony, newToken, initialFunding);
461461

462462
await colony.startNextRewardPayout(otherToken.address, ...colonyWideReputationProof);
@@ -559,7 +559,7 @@ contract("Colony Reward Payouts", accounts => {
559559
it("should be able to collect payout from two colonies at the same time", async () => {
560560
// Setting up a new token and two colonies
561561
const tokenArgs = getTokenArgs();
562-
const newToken = await DSToken.new(tokenArgs[1]);
562+
const newToken = await Token.new(tokenArgs);
563563

564564
let { logs } = await colonyNetwork.createColony(newToken.address);
565565
let { colonyAddress } = logs[0].args;
@@ -676,7 +676,7 @@ contract("Colony Reward Payouts", accounts => {
676676
it("should not be able to claim reward payout from a colony that didn't create it", async () => {
677677
// Setting up a new token and two colonies
678678
const tokenArgs = getTokenArgs();
679-
const newToken = await DSToken.new(tokenArgs[1]);
679+
const newToken = await Token.new(tokenArgs);
680680

681681
let { logs } = await colonyNetwork.createColony(newToken.address);
682682
let { colonyAddress } = logs[0].args;
@@ -815,14 +815,14 @@ contract("Colony Reward Payouts", accounts => {
815815
total reputation/tokens: ${data.totalReputation.toString()}`, async () => {
816816
// Setting up a new token and colony
817817
const tokenArgs = getTokenArgs();
818-
const newToken = await DSToken.new(tokenArgs[1]);
818+
const newToken = await Token.new(tokenArgs);
819819
let { logs } = await colonyNetwork.createColony(newToken.address);
820820
const { colonyAddress } = logs[0].args;
821821
await newToken.setOwner(colonyAddress);
822822
const newColony = await IColony.at(colonyAddress);
823823

824824
const payoutTokenArgs = getTokenArgs();
825-
const payoutToken = await DSToken.new(payoutTokenArgs[0]);
825+
const payoutToken = await Token.new(payoutTokenArgs);
826826
await fundColonyWithTokens(newColony, payoutToken, data.totalAmountOfPayoutTokens);
827827
// Issuing colony's internal tokens so they can be given to users in `bootstrapColony`
828828
await newColony.mintTokens(data.totalReputation);

‎test/colony-task.js

+2-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,7 @@ 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);
9393
});
9494

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

‎test/colony.js

+2-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,7 @@ 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);
7575

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

‎test/reputation-update.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const { expect } = chai;
4848
chai.use(bnChai(web3.utils.BN));
4949

5050
const IReputationMiningCycle = artifacts.require("IReputationMiningCycle");
51-
const DSToken = artifacts.require("DSToken");
51+
const Token = artifacts.require("Token");
5252
const TaskSkillEditing = artifacts.require("TaskSkillEditing");
5353

5454
contract("Reputation Updates", accounts => {
@@ -369,7 +369,7 @@ contract("Reputation Updates", accounts => {
369369
it("should not add entries to the reputation log for payments that are not in the colony home token", async () => {
370370
const RECIPIENT = accounts[3];
371371
const tokenArgs = getTokenArgs();
372-
const otherToken = await DSToken.new(tokenArgs[1]);
372+
const otherToken = await Token.new(tokenArgs);
373373
await fundColonyWithTokens(metaColony, otherToken, WAD.muln(2));
374374

375375
await metaColony.addPayment(1, 0, RECIPIENT, otherToken.address, WAD, 1, 3);

‎test/token-locking.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ chai.use(bnChai(web3.utils.BN));
1717
const EtherRouter = artifacts.require("EtherRouter");
1818
const IColonyNetwork = artifacts.require("IColonyNetwork");
1919
const ITokenLocking = artifacts.require("ITokenLocking");
20-
const DSToken = artifacts.require("DSToken");
20+
const Token = artifacts.require("Token");
2121

2222
const contractLoader = new TruffleLoader({
2323
contractDir: path.resolve(__dirname, "..", "build", "contracts")
@@ -50,7 +50,7 @@ contract("Token Locking", addresses => {
5050
await colony.bootstrapColony([userAddress], [usersTokens]);
5151

5252
const tokenArgs = getTokenArgs();
53-
otherToken = await DSToken.new(tokenArgs[1]);
53+
otherToken = await Token.new(tokenArgs);
5454

5555
await giveUserCLNYTokensAndStake(colonyNetwork, addresses[4], DEFAULT_STAKE);
5656
const client = new ReputationMinerTestWrapper({
@@ -254,7 +254,7 @@ contract("Token Locking", addresses => {
254254
await colony.startNextRewardPayout(otherToken.address, ...colonyWideReputationProof);
255255

256256
const tokenArgs = getTokenArgs();
257-
const newToken = await DSToken.new(tokenArgs[1]);
257+
const newToken = await Token.new(tokenArgs);
258258
await colony.startNextRewardPayout(newToken.address, ...colonyWideReputationProof);
259259

260260
const totalLockCount = await tokenLocking.getTotalLockCount(token.address);

0 commit comments

Comments
 (0)