diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json index efd5e13a2b..b5e9e3e156 100644 --- a/contracts/coordinator/compiler.json +++ b/contracts/coordinator/compiler.json @@ -21,5 +21,5 @@ } } }, - "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol", "test/TestMixins.sol"] + "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"] } diff --git a/contracts/coordinator/contracts/test/TestMixins.sol b/contracts/coordinator/contracts/test/TestMixins.sol deleted file mode 100644 index cdadce171c..0000000000 --- a/contracts/coordinator/contracts/test/TestMixins.sol +++ /dev/null @@ -1,37 +0,0 @@ -/* - - Copyright 2018 ZeroEx Intl. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ - -pragma solidity ^0.5.5; -pragma experimental "ABIEncoderV2"; - -import "../src/libs/LibConstants.sol"; -import "../src/MixinSignatureValidator.sol"; -import "../src/MixinCoordinatorApprovalVerifier.sol"; - - -// solhint-disable no-empty-blocks -contract TestMixins is - LibConstants, - MixinSignatureValidator, - MixinCoordinatorApprovalVerifier -{ - constructor (address _exchange) - public - LibConstants(_exchange) - {} -} diff --git a/contracts/coordinator/package.json b/contracts/coordinator/package.json index b139b9d7a9..afc8a0adc3 100644 --- a/contracts/coordinator/package.json +++ b/contracts/coordinator/package.json @@ -33,7 +33,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(Coordinator|CoordinatorRegistry|TestMixins).json", + "abis": "./generated-artifacts/@(Coordinator|CoordinatorRegistry).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/coordinator/src/artifacts.ts b/contracts/coordinator/src/artifacts.ts index 33ea7e16c6..8276964486 100644 --- a/contracts/coordinator/src/artifacts.ts +++ b/contracts/coordinator/src/artifacts.ts @@ -7,9 +7,7 @@ import { ContractArtifact } from 'ethereum-types'; import * as Coordinator from '../generated-artifacts/Coordinator.json'; import * as CoordinatorRegistry from '../generated-artifacts/CoordinatorRegistry.json'; -import * as TestMixins from '../generated-artifacts/TestMixins.json'; export const artifacts = { Coordinator: Coordinator as ContractArtifact, CoordinatorRegistry: CoordinatorRegistry as ContractArtifact, - TestMixins: TestMixins as ContractArtifact, }; diff --git a/contracts/coordinator/src/wrappers.ts b/contracts/coordinator/src/wrappers.ts index 7a3d20d327..a88791dffa 100644 --- a/contracts/coordinator/src/wrappers.ts +++ b/contracts/coordinator/src/wrappers.ts @@ -5,4 +5,3 @@ */ export * from '../generated-wrappers/coordinator'; export * from '../generated-wrappers/coordinator_registry'; -export * from '../generated-wrappers/test_mixins'; diff --git a/contracts/coordinator/test/mixins.ts b/contracts/coordinator/test/mixins.ts index a862791b0f..2e79423e1b 100644 --- a/contracts/coordinator/test/mixins.ts +++ b/contracts/coordinator/test/mixins.ts @@ -16,7 +16,7 @@ import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; import * as ethUtil from 'ethereumjs-util'; -import { ApprovalFactory, artifacts, constants, exchangeDataEncoder, TestMixinsContract } from '../src'; +import { ApprovalFactory, artifacts, constants, CoordinatorContract, exchangeDataEncoder } from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -26,7 +26,7 @@ describe('Mixins tests', () => { let transactionSignerAddress: string; let approvalSignerAddress1: string; let approvalSignerAddress2: string; - let mixins: TestMixinsContract; + let mixins: CoordinatorContract; let transactionFactory: TransactionFactory; let approvalFactory1: ApprovalFactory; let approvalFactory2: ApprovalFactory; @@ -40,8 +40,8 @@ describe('Mixins tests', () => { await blockchainLifecycle.revertAsync(); }); before(async () => { - mixins = await TestMixinsContract.deployFrom0xArtifactAsync( - artifacts.TestMixins, + mixins = await CoordinatorContract.deployFrom0xArtifactAsync( + artifacts.Coordinator, provider, txDefaults, exchangeAddress, diff --git a/contracts/coordinator/tsconfig.json b/contracts/coordinator/tsconfig.json index dc062512ca..ba2c48b6cd 100644 --- a/contracts/coordinator/tsconfig.json +++ b/contracts/coordinator/tsconfig.json @@ -2,10 +2,6 @@ "extends": "../../tsconfig", "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true }, "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], - "files": [ - "generated-artifacts/Coordinator.json", - "generated-artifacts/CoordinatorRegistry.json", - "generated-artifacts/TestMixins.json" - ], + "files": ["generated-artifacts/Coordinator.json", "generated-artifacts/CoordinatorRegistry.json"], "exclude": ["./deploy/solc/solc_bin"] }