diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-07-07 06:08:14 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-07-08 13:11:36 +0800 |
commit | 462f1f00d8151ad17f8909f2c07dbc807a0df87d (patch) | |
tree | cd4a7dece270466472d744b758047f3b3bd36510 /packages/contracts/src/2.0.0/forwarder/Forwarder.sol | |
parent | 1c80bba4ddcb01cb8e3694f86d3f81e7164b8991 (diff) | |
download | dexon-0x-contracts-462f1f00d8151ad17f8909f2c07dbc807a0df87d.tar.gz dexon-0x-contracts-462f1f00d8151ad17f8909f2c07dbc807a0df87d.tar.zst dexon-0x-contracts-462f1f00d8151ad17f8909f2c07dbc807a0df87d.zip |
Combine mixins
Diffstat (limited to 'packages/contracts/src/2.0.0/forwarder/Forwarder.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/forwarder/Forwarder.sol | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol index 38128d93e..0542736a3 100644 --- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol +++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol @@ -19,9 +19,8 @@ pragma solidity 0.4.24; pragma experimental ABIEncoderV2; -import "./MixinWethFees.sol"; -import "./MixinMarketSellTokens.sol"; -import "./MixinMarketBuyTokens.sol"; +import "./MixinFees.sol"; +import "./MixinForwarderCore.sol"; import "./MixinConstants.sol"; import "../utils/Ownable/Ownable.sol"; @@ -29,10 +28,9 @@ import "../utils/Ownable/Ownable.sol"; contract Forwarder is Ownable, MixinConstants, - MixinWethFees, + MixinFees, MixinMarketBuyZrx, - MixinMarketBuyTokens, - MixinMarketSellTokens + MixinForwarderCore { uint256 constant internal MAX_UINT = 2**256 - 1; |