merge development

3 files changed, 2 insertions, 21 deletions

diff --git a/packages/fill-scenarios/src/artifacts.ts b/packages/fill-scenarios/src/artifacts.ts
deleted file mode 100644
index b78ca0cc2..000000000
--- a/packages/fill-scenarios/src/artifacts.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
-import * as DummyERC721Token from './artifacts/DummyERC721Token.json';
-import * as Exchange from './artifacts/Exchange.json';
-
-export const artifacts = {
-    DummyERC20Token: (DummyERC20Token as any) as ContractArtifact,
-    DummyERC721Token: (DummyERC721Token as any) as ContractArtifact,
-    Exchange: (Exchange as any) as ContractArtifact,
-};
diff --git a/packages/fill-scenarios/src/fill_scenarios.ts b/packages/fill-scenarios/src/fill_scenarios.ts
index 604eeaffc..131828e8d 100644
--- a/packages/fill-scenarios/src/fill_scenarios.ts
+++ b/packages/fill-scenarios/src/fill_scenarios.ts
@@ -1,3 +1,5 @@
+import { DummyERC20TokenContract, DummyERC721TokenContract, ExchangeContract } from '@0xproject/abi-gen-wrappers';
+import * as artifacts from '@0xproject/contract-artifacts';
 import { assetDataUtils } from '@0xproject/order-utils';
 import { orderFactory } from '@0xproject/order-utils/lib/src/order_factory';
 import { AssetProxyId, ERC721AssetData, OrderWithoutExchangeAddress, SignedOrder } from '@0xproject/types';
@@ -6,11 +8,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts } from './artifacts';
 import { constants } from './constants';
-import { DummyERC20TokenContract } from './generated_contract_wrappers/dummy_erc20_token';
-import { DummyERC721TokenContract } from './generated_contract_wrappers/dummy_erc721_token';
-import { ExchangeContract } from './generated_contract_wrappers/exchange';
 
 export class FillScenarios {
     private readonly _web3Wrapper: Web3Wrapper;
diff --git a/packages/fill-scenarios/src/globals.d.ts b/packages/fill-scenarios/src/globals.d.ts
deleted file mode 100644
index 94e63a32d..000000000
--- a/packages/fill-scenarios/src/globals.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '*.json' {
-    const json: any;
-    /* tslint:disable */
-    export default json;
-    /* tslint:enable */
-}