Move OrderValidator to the protocol package

12 files changed, 20 insertions, 23 deletions

diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json
index 807429976..69d607b3e 100644
--- a/contracts/extensions/compiler.json
+++ b/contracts/extensions/compiler.json
@@ -18,5 +18,5 @@
             }
         }
     },
-    "contracts": ["DutchAuction", "Forwarder", "OrderValidator"]
+    "contracts": ["DutchAuction", "Forwarder"]
 }
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 14a7a8ed2..c09f69e43 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(DutchAuction|Forwarder|OrderValidator).json"
+        "abis": "generated-artifacts/@(DutchAuction|Forwarder).json"
     },
     "repository": {
         "type": "git",
diff --git a/contracts/extensions/src/artifacts/index.ts b/contracts/extensions/src/artifacts/index.ts
index 380bf0497..7588178f0 100644
--- a/contracts/extensions/src/artifacts/index.ts
+++ b/contracts/extensions/src/artifacts/index.ts
@@ -2,10 +2,8 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as DutchAuction from '../../generated-artifacts/DutchAuction.json';
 import * as Forwarder from '../../generated-artifacts/Forwarder.json';
-import * as OrderValidator from '../../generated-artifacts/OrderValidator.json';
 
 export const artifacts = {
     DutchAuction: DutchAuction as ContractArtifact,
     Forwarder: Forwarder as ContractArtifact,
-    OrderValidator: OrderValidator as ContractArtifact,
 };
diff --git a/contracts/extensions/src/wrappers/index.ts b/contracts/extensions/src/wrappers/index.ts
index 30f74b56e..90880e37f 100644
--- a/contracts/extensions/src/wrappers/index.ts
+++ b/contracts/extensions/src/wrappers/index.ts
@@ -1,3 +1,2 @@
 export * from '../../generated-wrappers/dutch_auction';
 export * from '../../generated-wrappers/forwarder';
-export * from '../../generated-wrappers/order_validator';
diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json
index c894eb367..a4ce1e002 100644
--- a/contracts/extensions/tsconfig.json
+++ b/contracts/extensions/tsconfig.json
@@ -6,10 +6,6 @@
         "resolveJsonModule": true
     },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": [
-        "./generated-artifacts/DutchAuction.json",
-        "./generated-artifacts/Forwarder.json",
-        "./generated-artifacts/OrderValidator.json"
-    ],
+    "files": ["./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"],
     "exclude": ["./deploy/solc/solc_bin"]
 }
diff --git a/contracts/protocol/compiler.json b/contracts/protocol/compiler.json
index 10e5bb0a1..c05d62aba 100644
--- a/contracts/protocol/compiler.json
+++ b/contracts/protocol/compiler.json
@@ -25,6 +25,7 @@
         "Exchange",
         "MixinAuthorizable",
         "MultiAssetProxy",
+        "OrderValidator",
         "TestAssetProxyOwner",
         "TestAssetProxyDispatcher",
         "TestExchangeInternals",
diff --git a/contracts/extensions/contracts/OrderValidator/OrderValidator.sol b/contracts/protocol/contracts/protocol/OrderValidator/OrderValidator.sol
index 33dd1326c..33dd1326c 100644
--- a/contracts/extensions/contracts/OrderValidator/OrderValidator.sol
+++ b/contracts/protocol/contracts/protocol/OrderValidator/OrderValidator.sol
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 8eb7f83f8..1dba64681 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(AssetProxyOwner|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiAssetProxy|TestSignatureValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver).json"
+        "abis": "generated-artifacts/@(AssetProxyOwner|ERC20Proxy|ERC721Proxy|Exchange|MixinAuthorizable|MultiAssetProxy|OrderValidator|TestSignatureValidator|TestAssetProxyOwner|TestAssetProxyDispatcher|TestExchangeInternals|TestStaticCallReceiver).json"
     },
     "repository": {
         "type": "git",
diff --git a/contracts/protocol/src/artifacts/index.ts b/contracts/protocol/src/artifacts/index.ts
index c5d12f10b..1d53ceb04 100644
--- a/contracts/protocol/src/artifacts/index.ts
+++ b/contracts/protocol/src/artifacts/index.ts
@@ -6,6 +6,7 @@ import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json';
 import * as Exchange from '../../generated-artifacts/Exchange.json';
 import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json';
 import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json';
+import * as OrderValidator from '../../generated-artifacts/OrderValidator.json';
 import * as TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json';
 import * as TestAssetProxyOwner from '../../generated-artifacts/TestAssetProxyOwner.json';
 import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json';
@@ -19,6 +20,7 @@ export const artifacts = {
     Exchange: Exchange as ContractArtifact,
     MixinAuthorizable: MixinAuthorizable as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
+    OrderValidator: OrderValidator as ContractArtifact,
     TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact,
     TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact,
     TestExchangeInternals: TestExchangeInternals as ContractArtifact,
diff --git a/contracts/protocol/src/wrappers/index.ts b/contracts/protocol/src/wrappers/index.ts
index 01b121054..ac951d269 100644
--- a/contracts/protocol/src/wrappers/index.ts
+++ b/contracts/protocol/src/wrappers/index.ts
@@ -3,6 +3,7 @@ export * from '../../generated-wrappers/erc20_proxy';
 export * from '../../generated-wrappers/erc721_proxy';
 export * from '../../generated-wrappers/exchange';
 export * from '../../generated-wrappers/mixin_authorizable';
+export * from '../../generated-wrappers/order_validator';
 export * from '../../generated-wrappers/test_asset_proxy_dispatcher';
 export * from '../../generated-wrappers/test_asset_proxy_owner';
 export * from '../../generated-wrappers/test_exchange_internals';
diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/protocol/test/exchange/order_validator.ts
index f0f3b43c7..8f53426db 100644
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ b/contracts/protocol/test/exchange/order_validator.ts
@@ -1,13 +1,4 @@
 import {
-    artifacts as protocolArtifacts,
-    ERC20ProxyContract,
-    ERC20Wrapper,
-    ERC721ProxyContract,
-    ERC721Wrapper,
-    ExchangeContract,
-    ExchangeWrapper,
-} from '@0x/contracts-protocol';
-import {
     chaiSetup,
     constants,
     OrderFactory,
@@ -24,8 +15,16 @@ import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { OrderValidatorContract } from '../../generated-wrappers/order_validator';
-import { artifacts } from '../../src/artifacts';
+import {
+    artifacts,
+    ERC20ProxyContract,
+    ERC20Wrapper,
+    ERC721ProxyContract,
+    ERC721Wrapper,
+    ExchangeContract,
+    ExchangeWrapper,
+    OrderValidatorContract,
+} from '../../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -81,7 +80,7 @@ describe('OrderValidator', () => {
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            artifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,
diff --git a/contracts/protocol/tsconfig.json b/contracts/protocol/tsconfig.json
index db872fc32..989d3ef2b 100644
--- a/contracts/protocol/tsconfig.json
+++ b/contracts/protocol/tsconfig.json
@@ -13,6 +13,7 @@
         "./generated-artifacts/Exchange.json",
         "./generated-artifacts/MixinAuthorizable.json",
         "./generated-artifacts/MultiAssetProxy.json",
+        "./generated-artifacts/OrderValidator.json",
         "./generated-artifacts/TestAssetProxyDispatcher.json",
         "./generated-artifacts/TestAssetProxyOwner.json",
         "./generated-artifacts/TestExchangeInternals.json",