Test coordinator protocol fees

contracts/exchange-forwarder/contracts/src/test/TestProtocolFeeCollector.sol

@@ -1,59 +0,0 @@
-/*
-
-  Copyright 2019 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.9;
-pragma experimental ABIEncoderV2;
-
-import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
-
-
- // solhint-disable no-unused-vars
-contract TestProtocolFeeCollector {
-
-    address private _wethAddress;
-
-    constructor (
-        address wethAddress
-    )
-        public
-    {
-        _wethAddress = wethAddress;
-    }
-
-    /// @dev Pays a protocol fee in WETH (Forwarder orders will always pay protocol fees in WETH).
-    /// @param makerAddress The address of the order's maker.
-    /// @param payerAddress The address of the protocol fee payer.
-    /// @param protocolFeePaid The protocol fee that should be paid.
-    function payProtocolFee(
-        address makerAddress,
-        address payerAddress,
-        uint256 protocolFeePaid
-    )
-        external
-        payable
-    {
-        assert(msg.value == 0);
-
-        // Transfer the protocol fee to this address in WETH.
-        IEtherToken(_wethAddress).transferFrom(
-            payerAddress,
-            address(this),
-            protocolFeePaid
-        );
-    }
-}

contracts/exchange-forwarder/package.json

@@ -35,7 +35,7 @@
         "compile:truffle": "truffle compile"
     },
     "config": {
-        "abis": "./generated-artifacts/@(Forwarder|IAssets|IForwarder|IForwarderCore|LibConstants|LibForwarderRichErrors|MixinAssets|MixinExchangeWrapper|MixinForwarderCore|MixinWeth|TestProtocolFeeCollector).json",
+        "abis": "./generated-artifacts/@(Forwarder|IAssets|IForwarder|IForwarderCore|LibConstants|LibForwarderRichErrors|MixinAssets|MixinExchangeWrapper|MixinForwarderCore|MixinWeth).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

contracts/exchange-forwarder/src/artifacts.ts

@@ -15,7 +15,6 @@ import * as MixinAssets from '../generated-artifacts/MixinAssets.json';
 import * as MixinExchangeWrapper from '../generated-artifacts/MixinExchangeWrapper.json';
 import * as MixinForwarderCore from '../generated-artifacts/MixinForwarderCore.json';
 import * as MixinWeth from '../generated-artifacts/MixinWeth.json';
-import * as TestProtocolFeeCollector from '../generated-artifacts/TestProtocolFeeCollector.json';
 export const artifacts = {
     Forwarder: Forwarder as ContractArtifact,
     MixinAssets: MixinAssets as ContractArtifact,
@@ -27,5 +26,4 @@ export const artifacts = {
     IForwarderCore: IForwarderCore as ContractArtifact,
     LibConstants: LibConstants as ContractArtifact,
     LibForwarderRichErrors: LibForwarderRichErrors as ContractArtifact,
-    TestProtocolFeeCollector: TestProtocolFeeCollector as ContractArtifact,
 };

contracts/exchange-forwarder/src/wrappers.ts

@@ -13,4 +13,3 @@ export * from '../generated-wrappers/mixin_assets';
 export * from '../generated-wrappers/mixin_exchange_wrapper';
 export * from '../generated-wrappers/mixin_forwarder_core';
 export * from '../generated-wrappers/mixin_weth';
-export * from '../generated-wrappers/test_protocol_fee_collector';

contracts/exchange-forwarder/test/forwarder.ts

@@ -1,7 +1,12 @@
 import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
 import { DummyERC721TokenContract } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
+import {
+    artifacts as exchangeArtifacts,
+    ExchangeContract,
+    ExchangeWrapper,
+    TestProtocolFeeCollectorContract,
+} from '@0x/contracts-exchange';
 import {
     blockchainTests,
     constants,
@@ -15,13 +20,7 @@ import { assetDataUtils, ForwarderRevertErrors } from '@0x/order-utils';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 
-import {
-    artifacts,
-    ForwarderContract,
-    ForwarderTestFactory,
-    ForwarderWrapper,
-    TestProtocolFeeCollectorContract,
-} from '../src';
+import { artifacts, ForwarderContract, ForwarderTestFactory, ForwarderWrapper } from '../src';
 
 const DECIMALS_DEFAULT = 18;
 
@@ -114,7 +113,7 @@ blockchainTests(ContractName.Forwarder, env => {
 
         // Set up Protocol Fee Collector
         protocolFeeCollector = await TestProtocolFeeCollectorContract.deployFrom0xArtifactAsync(
-            artifacts.TestProtocolFeeCollector,
+            exchangeArtifacts.TestProtocolFeeCollector,
             env.provider,
             env.txDefaults,
             {},

contracts/exchange-forwarder/tsconfig.json

@@ -12,8 +12,7 @@
         "generated-artifacts/MixinAssets.json",
         "generated-artifacts/MixinExchangeWrapper.json",
         "generated-artifacts/MixinForwarderCore.json",
-        "generated-artifacts/MixinWeth.json",
-        "generated-artifacts/TestProtocolFeeCollector.json"
+        "generated-artifacts/MixinWeth.json"
     ],
     "exclude": ["./deploy/solc/solc_bin"]
 }