From b6f4c5c7da7d0afe65c0e3dba97aa64e11934595 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 9 Dec 2018 15:03:45 -0800 Subject: Fix build and add back tests --- contracts/extensions/contracts/OrderMatcher/MixinAssets.sol | 4 ++-- contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol | 2 +- contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contracts/extensions') 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"; -- cgit v1.2.3