From 301cb296ec77e8af5c1722679e04cb983c848153 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 21 Aug 2018 23:58:06 +0100
Subject: Move types from sol-compiler to types so they can be used in other
 places without requiring sol-compiler as a dep

---
 packages/contract-wrappers/src/artifacts.ts                          | 2 +-
 packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts | 2 +-
 packages/contract-wrappers/src/index.ts                              | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'packages/contract-wrappers/src')

diff --git a/packages/contract-wrappers/src/artifacts.ts b/packages/contract-wrappers/src/artifacts.ts
index 2481b311a..7e67544d2 100644
--- a/packages/contract-wrappers/src/artifacts.ts
+++ b/packages/contract-wrappers/src/artifacts.ts
@@ -1,4 +1,4 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
+import { ContractArtifact } from 'ethereum-types';
 
 import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from './artifacts/DummyERC721Token.json';
diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
index daf70253a..490a6c50a 100644
--- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
@@ -1,6 +1,6 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
 import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { ContractArtifact } from 'ethereum-types';
 import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from 'ethereum-types';
 import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index f7c10dcce..7b9f3cd12 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -51,15 +51,12 @@ export {
     DataItem,
     ConstructorStateMutability,
     StateMutability,
-} from 'ethereum-types';
-
-export {
     ContractArtifact,
     GeneratedCompilerOptions,
     ContractNetworks,
     Source,
     ContractNetworkData,
-} from '@0xproject/sol-compiler';
+} from 'ethereum-types';
 
 export {
     WETH9Events,
-- 
cgit