aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/extensions
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-12-10 07:03:45 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-12-21 01:13:36 +0800
commitb6f4c5c7da7d0afe65c0e3dba97aa64e11934595 (patch)
treee6adce933de168e2ff6f486a0237b1b6832aae7e /contracts/extensions
parenta6ec2a8c549b9493c3ebd96bed58bb8016e5f2be (diff)
downloaddexon-0x-contracts-b6f4c5c7da7d0afe65c0e3dba97aa64e11934595.tar.gz
dexon-0x-contracts-b6f4c5c7da7d0afe65c0e3dba97aa64e11934595.tar.zst
dexon-0x-contracts-b6f4c5c7da7d0afe65c0e3dba97aa64e11934595.zip
Fix build and add back tests
Diffstat (limited to 'contracts/extensions')
-rw-r--r--contracts/extensions/contracts/OrderMatcher/MixinAssets.sol4
-rw-r--r--contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol2
-rw-r--r--contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol2
3 files changed, 4 insertions, 4 deletions
diff --git a/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol b/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
index a2bc95e4b..43e19c19e 100644
--- a/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
+++ b/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
@@ -18,8 +18,8 @@
pragma solidity 0.4.24;
-import "../../utils/LibBytes/LibBytes.sol";
-import "../../utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
import "../../tokens/ERC20Token/IERC20Token.sol";
import "../../tokens/ERC721Token/IERC721Token.sol";
import "./mixins/MAssets.sol";
diff --git a/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol b/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
index 1c7cce675..ffe037ee7 100644
--- a/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
+++ b/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
@@ -18,8 +18,8 @@
pragma solidity 0.4.24;
-import "../../utils/Ownable/Ownable.sol";
import "./libs/LibConstants.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
contract MixinMatchOrders is
diff --git a/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol b/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
index b6f1566cf..7136c8c82 100644
--- a/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
+++ b/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
@@ -18,7 +18,7 @@
pragma solidity 0.4.24;
-import "../../utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
import "./libs/LibConstants.sol";
import "./MixinMatchOrders.sol";
import "./MixinAssets.sol";