From 814518dd8094d03908d77e39faa21b8758f1552b Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Mon, 9 Jul 2018 21:09:45 -0700
Subject: Refactor forwarding contract architecture, remove batch functions

---
 packages/contracts/src/2.0.0/forwarder/Forwarder.sol | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'packages/contracts/src/2.0.0/forwarder/Forwarder.sol')

diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
index 546e7f22c..4405d5e46 100644
--- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
+++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
@@ -19,20 +19,17 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "./MixinFees.sol";
+import "./MixinWeth.sol";
 import "./MixinForwarderCore.sol";
 import "./MixinConstants.sol";
-import "./MixinMarketBuyZrx.sol";
-import "./MixinExpectedResults.sol";
-import "./MixinTransfer.sol";
+import "./MixinAssets.sol";
 
 
+// solhint-disable no-empty-blocks
 contract Forwarder is
     MixinConstants,
-    MixinExpectedResults,
-    MixinFees,
-    MixinMarketBuyZrx,
-    MixinTransfer,
+    MixinWeth,
+    MixinAssets,
     MixinForwarderCore
 {
 
-- 
cgit v1.2.3