Remove TestMixins contract

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"]
 }

contracts/coordinator/contracts/test/TestMixins.sol

@@ -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)
-    {}
-}

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": {

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,
 };

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';

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,

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"]
 }