Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.

Commit 3e04cf4

Browse files
asoongasoong
committed
Remove extraneous setup into coreWrapper and beforeEach blocks
1 parent bb3b908 commit 3e04cf4

File tree

7 files changed

+75
-151
lines changed

7 files changed

+75
-151
lines changed

‎test/core/extensions/coreAccounting.spec.ts‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -54,47 +54,19 @@ contract("CoreAccounting", (accounts) => {
5454
const coreWrapper = new CoreWrapper(ownerAccount, ownerAccount);
5555
const erc20Wrapper = new ERC20Wrapper(ownerAccount);
5656

57-
const setCoreDependencies = async (from: Address = ownerAccount) => {
58-
await core.setVaultAddress.sendTransactionAsync(
59-
vault.address,
60-
{ from },
61-
);
62-
await core.setTransferProxyAddress.sendTransactionAsync(
63-
transferProxy.address,
64-
{ from },
65-
);
66-
67-
await core.enableFactory.sendTransactionAsync(
68-
setTokenFactory.address,
69-
{ from },
70-
);
71-
};
72-
73-
// TODO: Leaving this setup modular right now so we can toggle the deployers, authorizers, etc. if we want.
74-
// If we decide later that we don't need to, then we can move the abstracted setup functions into this one.
75-
const deployCoreAndInitializeDependencies = async (from: Address = ownerAccount) => {
57+
beforeEach(async () => {
7658
core = await coreWrapper.deployCoreAsync();
77-
7859
vault = await coreWrapper.deployVaultAsync();
79-
await coreWrapper.addAuthorizationAsync(vault, core.address);
80-
8160
transferProxy = await coreWrapper.deployTransferProxyAsync(vault.address);
82-
await coreWrapper.addAuthorizationAsync(transferProxy, core.address);
83-
8461
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
85-
await coreWrapper.addAuthorizationAsync(setTokenFactory, core.address);
86-
await coreWrapper.setCoreAddress(setTokenFactory, core.address);
87-
88-
await setCoreDependencies();
89-
};
62+
await coreWrapper.setDefaultStateAndAuthorizationsAsync(core, vault, transferProxy, setTokenFactory);
63+
});
9064

9165
describe("#deposit", async () => {
9266
const tokenOwner: Address = ownerAccount;
9367
const approver: Address = ownerAccount;
9468

9569
beforeEach(async () => {
96-
await deployCoreAndInitializeDependencies();
97-
9870
mockToken = await erc20Wrapper.deployTokenAsync(tokenOwner);
9971
await erc20Wrapper.approveTransferAsync(mockToken, transferProxy.address, approver);
10072
});
@@ -187,8 +159,6 @@ contract("CoreAccounting", (accounts) => {
187159
const ownerBalanceInVault: BigNumber = DEPLOYED_TOKEN_QUANTITY;
188160

189161
beforeEach(async () => {
190-
await deployCoreAndInitializeDependencies();
191-
192162
mockToken = await erc20Wrapper.deployTokenAsync(tokenOwner);
193163
await erc20Wrapper.approveTransferAsync(mockToken, transferProxy.address, approver);
194164
await coreWrapper.depositFromUser(core, mockToken.address, ownerBalanceInVault);
@@ -271,8 +241,6 @@ contract("CoreAccounting", (accounts) => {
271241
let tokenCount: number = 1;
272242

273243
beforeEach(async () => {
274-
await deployCoreAndInitializeDependencies();
275-
276244
mockTokens = await erc20Wrapper.deployTokensAsync(tokenCount, tokenOwner);
277245
const approvePromises = _.map(mockTokens, (token) =>
278246
token.approve.sendTransactionAsync(
@@ -402,8 +370,6 @@ contract("CoreAccounting", (accounts) => {
402370
let tokenCount: number = 3;
403371

404372
beforeEach(async () => {
405-
await deployCoreAndInitializeDependencies();
406-
407373
mockTokens = await erc20Wrapper.deployTokensAsync(tokenCount, tokenOwner);
408374
const approvePromises = _.map(mockTokens, (token) =>
409375
token.approve.sendTransactionAsync(

‎test/core/extensions/coreFactory.spec.ts‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,6 @@ contract("CoreFactory", (accounts) => {
6262
const coreWrapper = new CoreWrapper(ownerAccount, ownerAccount);
6363
const erc20Wrapper = new ERC20Wrapper(ownerAccount);
6464

65-
// TODO: Leaving this setup modular right now so we can toggle the deployers, authorizers, etc. if we want.
66-
// If we decide later that we don't need to, then we can move the abstracted setup functions into this one.
67-
const deployCoreAndInitializeDependencies = async (from: Address = ownerAccount) => {
68-
core = await coreWrapper.deployCoreAsync();
69-
70-
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
71-
await coreWrapper.addAuthorizationAsync(setTokenFactory, core.address);
72-
await coreWrapper.setCoreAddress(setTokenFactory, core.address);
73-
74-
await core.enableFactory.sendTransactionAsync(
75-
setTokenFactory.address,
76-
{ from },
77-
);
78-
};
79-
8065
before(async () => {
8166
ABIDecoder.addABI(Core.abi);
8267
});
@@ -87,6 +72,10 @@ contract("CoreFactory", (accounts) => {
8772

8873
beforeEach(async () => {
8974
core = await coreWrapper.deployCoreAsync();
75+
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
76+
await coreWrapper.addAuthorizationAsync(setTokenFactory, core.address);
77+
await coreWrapper.setCoreAddress(setTokenFactory, core.address);
78+
await coreWrapper.enableFactoryAsync(core, setTokenFactory);
9079
});
9180

9281
describe("#create", async () => {
@@ -99,7 +88,6 @@ contract("CoreFactory", (accounts) => {
9988
const symbol = "SET";
10089

10190
beforeEach(async () => {
102-
await deployCoreAndInitializeDependencies();
10391
mockToken = await erc20Wrapper.deployTokenAsync(ownerAccount);
10492

10593
factoryAddress = setTokenFactory.address;

‎test/core/extensions/coreInternal.spec.ts‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ contract("CoreInternal", (accounts) => {
173173

174174
beforeEach(async () => {
175175
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
176-
await core.enableFactory.sendTransactionAsync(setTokenFactory.address, {
177-
from: ownerAccount,
178-
});
176+
await coreWrapper.enableFactoryAsync(core, setTokenFactory);
179177

180178
subjectCaller = ownerAccount;
181179
});
@@ -211,28 +209,9 @@ contract("CoreInternal", (accounts) => {
211209

212210
beforeEach(async () => {
213211
vault = await coreWrapper.deployVaultAsync();
214-
await coreWrapper.addAuthorizationAsync(vault, core.address);
215-
216212
transferProxy = await coreWrapper.deployTransferProxyAsync(vault.address);
217-
await coreWrapper.addAuthorizationAsync(transferProxy, core.address);
218-
219213
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
220-
await coreWrapper.addAuthorizationAsync(setTokenFactory, core.address);
221-
await coreWrapper.setCoreAddress(setTokenFactory, core.address);
222-
223-
await core.setVaultAddress.sendTransactionAsync(
224-
vault.address,
225-
{ from: ownerAccount },
226-
);
227-
await core.setTransferProxyAddress.sendTransactionAsync(
228-
transferProxy.address,
229-
{ from: ownerAccount },
230-
);
231-
232-
await core.enableFactory.sendTransactionAsync(
233-
setTokenFactory.address,
234-
{ from: ownerAccount },
235-
);
214+
await coreWrapper.setDefaultStateAndAuthorizationsAsync(core, vault, transferProxy, setTokenFactory);
236215

237216
const components = await erc20Wrapper.deployTokensAsync(2, ownerAccount);
238217
const componentAddresses = _.map(components, (token) => token.address);
@@ -243,8 +222,6 @@ contract("CoreInternal", (accounts) => {
243222
componentAddresses,
244223
componentUnits,
245224
STANDARD_NATURAL_UNIT,
246-
"Set Token",
247-
"SET",
248225
);
249226

250227
subjectCaller = ownerAccount;

‎test/core/extensions/coreIssuance.spec.ts‎

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,6 @@ contract("CoreIssuance", (accounts) => {
6767
const coreWrapper = new CoreWrapper(ownerAccount, ownerAccount);
6868
const erc20Wrapper = new ERC20Wrapper(ownerAccount);
6969

70-
const deployCoreAndInitializeDependencies = async () => {
71-
core = await coreWrapper.deployCoreAsync();
72-
73-
vault = await coreWrapper.deployVaultAsync();
74-
await coreWrapper.addAuthorizationAsync(vault, core.address);
75-
76-
transferProxy = await coreWrapper.deployTransferProxyAsync(vault.address);
77-
await coreWrapper.addAuthorizationAsync(transferProxy, core.address);
78-
79-
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
80-
await coreWrapper.addAuthorizationAsync(setTokenFactory, core.address);
81-
await coreWrapper.setCoreAddress(setTokenFactory, core.address);
82-
83-
await core.setVaultAddress.sendTransactionAsync(
84-
vault.address,
85-
{ from: ownerAccount },
86-
);
87-
await core.setTransferProxyAddress.sendTransactionAsync(
88-
transferProxy.address,
89-
{ from: ownerAccount },
90-
);
91-
92-
await core.enableFactory.sendTransactionAsync(
93-
setTokenFactory.address,
94-
{ from: ownerAccount },
95-
);
96-
};
97-
9870
before(async () => {
9971
ABIDecoder.addABI(Core.abi);
10072
});
@@ -103,6 +75,14 @@ contract("CoreIssuance", (accounts) => {
10375
ABIDecoder.removeABI(Core.abi);
10476
});
10577

78+
beforeEach(async () => {
79+
core = await coreWrapper.deployCoreAsync();
80+
vault = await coreWrapper.deployVaultAsync();
81+
transferProxy = await coreWrapper.deployTransferProxyAsync(vault.address);
82+
setTokenFactory = await coreWrapper.deploySetTokenFactoryAsync();
83+
await coreWrapper.setDefaultStateAndAuthorizationsAsync(core, vault, transferProxy, setTokenFactory);
84+
});
85+
10686
describe("#issue", async () => {
10787
let subjectCaller: Address;
10888
let subjectQuantityToIssue: BigNumber;
@@ -114,8 +94,6 @@ contract("CoreIssuance", (accounts) => {
11494
let setToken: SetTokenContract;
11595

11696
beforeEach(async () => {
117-
await deployCoreAndInitializeDependencies();
118-
11997
components = await erc20Wrapper.deployTokensAsync(2, ownerAccount);
12098
await erc20Wrapper.approveTransfersAsync(components, transferProxy.address);
12199

@@ -127,8 +105,6 @@ contract("CoreIssuance", (accounts) => {
127105
componentAddresses,
128106
componentUnits,
129107
naturalUnit,
130-
"Set Token",
131-
"SET",
132108
);
133109

134110
subjectCaller = ownerAccount;
@@ -385,8 +361,6 @@ contract("CoreIssuance", (accounts) => {
385361
let setToken: SetTokenContract;
386362

387363
beforeEach(async () => {
388-
await deployCoreAndInitializeDependencies();
389-
390364
components = await erc20Wrapper.deployTokensAsync(2, ownerAccount);
391365
await erc20Wrapper.approveTransfersAsync(components, transferProxy.address);
392366

@@ -398,15 +372,9 @@ contract("CoreIssuance", (accounts) => {
398372
componentAddresses,
399373
componentUnits,
400374
naturalUnit,
401-
"Set Token",
402-
"SET",
403375
);
404376

405-
await coreWrapper.issueSetTokenAsync(
406-
core,
407-
setToken.address,
408-
naturalUnit,
409-
);
377+
await coreWrapper.issueSetTokenAsync(core, setToken.address, naturalUnit);
410378

411379
subjectCaller = ownerAccount;
412380
subjectQuantityToRedeem = naturalUnit;

‎test/core/setToken.spec.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ contract("SetToken", (accounts) => {
6262
const erc20Wrapper = new ERC20Wrapper(deployerAccount);
6363

6464
before(async () => {
65-
// Initialize ABI Decoders for deciphering log receipts
6665
ABIDecoder.addABI(SetToken.abi);
6766
});
6867

@@ -76,7 +75,6 @@ contract("SetToken", (accounts) => {
7675
let subjectNaturalUnit: BigNumber;
7776
const subjectName: string = "Set Token";
7877
const subjectSymbol: string = "SET";
79-
8078
const componentCount: number = 3;
8179

8280
beforeEach(async () => {

‎test/core/vault.spec.ts‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@ import { StandardTokenMockContract } from "../../types/generated/standard_token_
1313
import { StandardTokenWithFeeMockContract } from "../../types/generated/standard_token_with_fee_mock";
1414
import { VaultContract } from "../../types/generated/vault";
1515

16-
// Artifacts
17-
const Vault = artifacts.require("Vault");
18-
19-
// Core wrapper
20-
import { CoreWrapper } from "../utils/coreWrapper";
21-
import { ERC20Wrapper } from "../utils/erc20Wrapper";
22-
2316
// Testing Set up
2417
import { BigNumberSetup } from "../config/bigNumberSetup";
2518
import ChaiSetup from "../config/chaiSetup";
2619
BigNumberSetup.configure();
2720
ChaiSetup.configure();
2821
const { expect, assert } = chai;
2922

23+
import { CoreWrapper } from "../utils/coreWrapper";
24+
import { ERC20Wrapper } from "../utils/erc20Wrapper";
3025
import { assertTokenBalance, expectRevertError } from "../utils/tokenAssertions";
3126
import { DEPLOYED_TOKEN_QUANTITY, NULL_ADDRESS, ZERO } from "../utils/constants";
3227

@@ -44,14 +39,6 @@ contract("Vault", (accounts) => {
4439
const coreWrapper = new CoreWrapper(ownerAccount, ownerAccount);
4540
const erc20Wrapper = new ERC20Wrapper(ownerAccount);
4641

47-
before(async () => {
48-
ABIDecoder.addABI(Vault.abi);
49-
});
50-
51-
after(async () => {
52-
ABIDecoder.removeABI(Vault.abi);
53-
});
54-
5542
describe("#withdrawTo", async () => {
5643
let subjectAmountToWithdraw: BigNumber = DEPLOYED_TOKEN_QUANTITY;
5744
let subjectCaller: Address = authorizedAccount;

0 commit comments

Comments
 (0)