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

Commit ffb2e72

Browse files
asoongasoong
authored
Merge pull request #64 from SetProtocol/alex/directory_cleanup
Clean up file directory
2 parents 0dd77f4 + f4a428d commit ffb2e72

25 files changed

+119
-391
lines changed

‎contracts/core/Core.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pragma solidity 0.4.24;
1818

1919
import { Ownable } from "zeppelin-solidity/contracts/ownership/Ownable.sol";
2020
import { SafeMath } from "zeppelin-solidity/contracts/math/SafeMath.sol";
21-
import { CoreInternal } from "./CoreInternal.sol";
22-
import { CoreIssuance } from "./CoreIssuance.sol";
21+
import { CoreInternal } from "./extensions/CoreInternal.sol";
22+
import { CoreIssuance } from "./extensions/CoreIssuance.sol";
2323
import { CoreState } from "./lib/CoreState.sol";
2424
import { ISetFactory } from "./interfaces/ISetFactory.sol";
2525
import { ITransferProxy } from "./interfaces/ITransferProxy.sol";

‎contracts/core/CoreInternal.sol‎ renamed to ‎contracts/core/extensions/CoreInternal.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
pragma solidity 0.4.24;
1818

1919
import { Ownable } from "zeppelin-solidity/contracts/ownership/Ownable.sol";
20-
import { CoreState } from "./lib/CoreState.sol";
20+
import { CoreState } from "../lib/CoreState.sol";
2121

2222

2323
/**

‎contracts/core/CoreIssuance.sol‎ renamed to ‎contracts/core/extensions/CoreIssuance.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
pragma solidity 0.4.24;
1818

1919
import { SafeMath } from "zeppelin-solidity/contracts/math/SafeMath.sol";
20-
import { CoreState } from "./lib/CoreState.sol";
21-
import { ISetToken } from "./interfaces/ISetToken.sol";
22-
import { ITransferProxy } from "./interfaces/ITransferProxy.sol";
23-
import { IVault } from "./interfaces/IVault.sol";
20+
import { CoreState } from "../lib/CoreState.sol";
21+
import { ISetToken } from "../interfaces/ISetToken.sol";
22+
import { ITransferProxy } from "../interfaces/ITransferProxy.sol";
23+
import { IVault } from "../interfaces/IVault.sol";
2424

2525

2626
/**

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"dist": "bash scripts/prepare_dist.sh",
2323
"clean": "rm -rf build; rm -rf transpiled; rm -rf types/generated",
2424
"compile": "truffle compile",
25-
"prepare-test": "yarn clean && truffle compile --all && yarn run generate-typings && yarn run transpile",
26-
"test": "yarn prepare-test && truffle test transpiled/test/*.js",
25+
"prepare-test": "yarn clean && truffle compile --all && yarn run generate-typings && yarn run transpile",
26+
"test": "yarn prepare-test && truffle test transpiled/test/core/**/*.js",
2727
"transpile": "tsc",
2828
"generate-typings": "abi-gen --abis './build/contracts/*.json' --out './types/generated' --template './types/contract_templates/contract.mustache' --partials './types/contract_templates/partials/*.mustache' && yarn run rename-generated-abi",
2929
"rename-generated-abi": "mv types/generated/detailed_e_r_c20.ts types/generated/detailed_erc20.ts && mv types/generated/e_r_c20_basic.ts types/generated/erc20_basic.ts",

‎test/config/bignumber_setup.ts‎ renamed to ‎test/config/bigNumberSetup.ts‎

File renamed without changes.

‎test/config/chai_setup.ts‎ renamed to ‎test/config/chaiSetup.ts‎

File renamed without changes.

‎test/authorizable.spec.ts‎ renamed to ‎test/core/authorizable.spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ import * as ABIDecoder from "abi-decoder";
55
import { BigNumber } from "bignumber.js";
66

77
// Types
8-
import { Address, Log, UInt } from "../types/common.js";
8+
import { Address, Log, UInt } from "../../types/common.js";
99

1010
// Contract types
11-
import { AuthorizableContract } from "../types/generated/authorizable";
11+
import { AuthorizableContract } from "../../types/generated/authorizable";
1212

1313
// Artifacts
1414
const Authorizable = artifacts.require("Authorizable");
1515

1616
// Core wrapper
17-
import { CoreWrapper } from "./utils/coreWrapper";
17+
import { CoreWrapper } from "../utils/coreWrapper";
1818

1919
// Testing Set up
20-
import { BigNumberSetup } from "./config/bignumber_setup";
21-
import ChaiSetup from "./config/chai_setup";
20+
import { BigNumberSetup } from "../config/bigNumberSetup";
21+
import ChaiSetup from "../config/chaiSetup";
2222
BigNumberSetup.configure();
2323
ChaiSetup.configure();
2424
const { expect, assert } = chai;
2525

26-
import { getFormattedLogsFromTxHash } from "./logs/log_utils";
26+
import { getFormattedLogsFromTxHash } from "../logs/logUtils";
2727

2828
import {
2929
assertLogEquivalence,
30-
} from "./logs/logAssertions";
30+
} from "../logs/logAssertions";
3131

3232
import {
3333
getExpectedAddAuthorizedLog,
3434
getExpectedRemoveAuthorizedLog,
35-
} from "./logs/Authorizable";
35+
} from "../logs/contracts/authorizable";
3636

3737
import {
3838
expectRevertError,
39-
} from "./utils/tokenAssertions";
39+
} from "../utils/tokenAssertions";
4040
import {
4141
DEPLOYED_TOKEN_QUANTITY,
4242
UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
43-
} from "./constants/constants";
43+
} from "../utils/constants";
4444

4545
contract("Authorizable", (accounts) => {
4646
const [

‎test/core.spec.ts‎ renamed to ‎test/core/core.spec.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,56 @@ import * as _ from "lodash";
33

44
import * as ABIDecoder from "abi-decoder";
55
import { BigNumber } from "bignumber.js";
6-
import { ether } from "./utils/units";
6+
import { ether } from "../utils/units";
77

88
// Types
9-
import { Address, Log } from "../types/common.js";
9+
import { Address, Log } from "../../types/common.js";
1010

1111
// Contract types
12-
import { AuthorizableContract } from "../types/generated/authorizable";
13-
import { CoreContract } from "../types/generated/core";
14-
import { SetTokenContract } from "../types/generated/set_token";
15-
import { SetTokenFactoryContract } from "../types/generated/set_token_factory";
16-
import { StandardTokenMockContract } from "../types/generated/standard_token_mock";
17-
import { TransferProxyContract } from "../types/generated/transfer_proxy";
18-
import { VaultContract } from "../types/generated/vault";
12+
import { AuthorizableContract } from "../../types/generated/authorizable";
13+
import { CoreContract } from "../../types/generated/core";
14+
import { SetTokenContract } from "../../types/generated/set_token";
15+
import { SetTokenFactoryContract } from "../../types/generated/set_token_factory";
16+
import { StandardTokenMockContract } from "../../types/generated/standard_token_mock";
17+
import { TransferProxyContract } from "../../types/generated/transfer_proxy";
18+
import { VaultContract } from "../../types/generated/vault";
1919

2020
// Artifacts
2121
const Core = artifacts.require("Core");
2222

2323
// Core wrapper
24-
import { CoreWrapper } from "./utils/coreWrapper";
24+
import { CoreWrapper } from "../utils/coreWrapper";
2525

2626
// Testing Set up
27-
import { BigNumberSetup } from "./config/bignumber_setup";
28-
import ChaiSetup from "./config/chai_setup";
27+
import { BigNumberSetup } from "../config/bigNumberSetup";
28+
import ChaiSetup from "../config/chaiSetup";
2929
BigNumberSetup.configure();
3030
ChaiSetup.configure();
3131
const { expect, assert } = chai;
3232

33-
import { getFormattedLogsFromTxHash } from "./logs/log_utils";
33+
import { getFormattedLogsFromTxHash } from "../logs/logUtils";
3434
import {
3535
extractNewSetTokenAddressFromLogs,
3636
IssuanceComponentDeposited,
3737
SetTokenCreated,
38-
} from "./logs/Core";
38+
} from "../logs/contracts/core";
3939

4040
import {
4141
assertTokenBalance,
4242
expectRevertError,
43-
} from "./utils/tokenAssertions";
43+
} from "../utils/tokenAssertions";
4444
import {
4545
DEFAULT_GAS,
4646
DEPLOYED_TOKEN_QUANTITY,
4747
NULL_ADDRESS,
4848
ONE,
4949
STANDARD_NATURAL_UNIT,
5050
UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
51-
} from "./constants/constants";
51+
} from "../utils/constants";
5252

5353
import {
5454
assertLogEquivalence,
55-
} from "./logs/logAssertions";
55+
} from "../logs/logAssertions";
5656

5757
contract("Core", (accounts) => {
5858
const [

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@ import * as _ from "lodash";
33

44
import * as ABIDecoder from "abi-decoder";
55
import { BigNumber } from "bignumber.js";
6-
import { ether } from "./utils/units";
6+
import { ether } from "../../utils/units";
77

88
// Types
9-
import { Address } from "../types/common.js";
9+
import { Address } from "../../../types/common.js";
1010

1111
// Contract types
12-
import { CoreContract } from "../types/generated/core";
13-
import { SetTokenContract } from "../types/generated/set_token";
14-
import { SetTokenFactoryContract } from "../types/generated/set_token_factory";
15-
import { StandardTokenMockContract } from "../types/generated/standard_token_mock";
16-
import { TransferProxyContract } from "../types/generated/transfer_proxy";
17-
import { VaultContract } from "../types/generated/vault";
12+
import { CoreContract } from "../../../types/generated/core";
13+
import { SetTokenContract } from "../../../types/generated/set_token";
14+
import { SetTokenFactoryContract } from "../../../types/generated/set_token_factory";
15+
import { StandardTokenMockContract } from "../../../types/generated/standard_token_mock";
16+
import { TransferProxyContract } from "../../../types/generated/transfer_proxy";
17+
import { VaultContract } from "../../../types/generated/vault";
1818

1919
// Artifacts
2020
const Core = artifacts.require("Core");
2121

2222
// Core wrapper
23-
import { CoreWrapper } from "./utils/coreWrapper";
23+
import { CoreWrapper } from "../../utils/coreWrapper";
2424

2525
// Testing Set up
26-
import { BigNumberSetup } from "./config/bignumber_setup";
27-
import ChaiSetup from "./config/chai_setup";
26+
import { BigNumberSetup } from "../../config/bigNumberSetup";
27+
import ChaiSetup from "../../config/chaiSetup";
2828
BigNumberSetup.configure();
2929
ChaiSetup.configure();
3030
const { expect } = chai;
3131

3232
import {
3333
expectRevertError,
34-
} from "./utils/tokenAssertions";
34+
} from "../../utils/tokenAssertions";
3535

3636
import {
3737
STANDARD_NATURAL_UNIT,
38-
} from "./constants/constants";
38+
} from "../../utils/constants";
3939

4040
contract("CoreInternal", (accounts) => {
4141
const [

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,53 @@ import * as _ from "lodash";
33

44
import * as ABIDecoder from "abi-decoder";
55
import { BigNumber } from "bignumber.js";
6-
import { ether } from "./utils/units";
6+
import { ether } from "../../utils/units";
77

88
// Types
9-
import { Address, Log } from "../types/common.js";
9+
import { Address, Log } from "../../../types/common.js";
1010

1111
// Contract types
12-
import { CoreContract } from "../types/generated/core";
13-
import { SetTokenContract } from "../types/generated/set_token";
14-
import { SetTokenFactoryContract } from "../types/generated/set_token_factory";
15-
import { StandardTokenMockContract } from "../types/generated/standard_token_mock";
16-
import { TransferProxyContract } from "../types/generated/transfer_proxy";
17-
import { VaultContract } from "../types/generated/vault";
12+
import { CoreContract } from "../../../types/generated/core";
13+
import { SetTokenContract } from "../../../types/generated/set_token";
14+
import { SetTokenFactoryContract } from "../../../types/generated/set_token_factory";
15+
import { StandardTokenMockContract } from "../../../types/generated/standard_token_mock";
16+
import { TransferProxyContract } from "../../../types/generated/transfer_proxy";
17+
import { VaultContract } from "../../../types/generated/vault";
1818

1919
// Artifacts
2020
const Core = artifacts.require("Core");
2121

2222
// Core wrapper
23-
import { CoreWrapper } from "./utils/coreWrapper";
23+
import { CoreWrapper } from "../../utils/coreWrapper";
2424

2525
// Testing Set up
26-
import { BigNumberSetup } from "./config/bignumber_setup";
27-
import ChaiSetup from "./config/chai_setup";
26+
import { BigNumberSetup } from "../../config/bigNumberSetup";
27+
import ChaiSetup from "../../config/chaiSetup";
2828
BigNumberSetup.configure();
2929
ChaiSetup.configure();
3030
const { expect, assert } = chai;
3131

32-
import { getFormattedLogsFromTxHash } from "./logs/log_utils";
32+
import { getFormattedLogsFromTxHash } from "../../logs/logUtils";
3333
import {
3434
extractNewSetTokenAddressFromLogs,
3535
IssuanceComponentDeposited,
36-
} from "./logs/Core";
36+
} from "../../logs/contracts/core";
3737

3838
import {
3939
assertTokenBalance,
4040
expectRevertError,
41-
} from "./utils/tokenAssertions";
41+
} from "../../utils/tokenAssertions";
4242

4343
import {
4444
DEFAULT_GAS,
4545
DEPLOYED_TOKEN_QUANTITY,
4646
NULL_ADDRESS,
4747
ZERO,
48-
} from "./constants/constants";
48+
} from "../../utils/constants";
4949

5050
import {
5151
assertLogEquivalence,
52-
} from "./logs/logAssertions";
52+
} from "../../logs/logAssertions";
5353

5454
contract("CoreIssuance", (accounts) => {
5555
const [

0 commit comments

Comments
 (0)