From 68f150eff2c4afeccf7eee43e9f40297f88fc8dd Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 9 Oct 2018 23:42:12 -0700 Subject: Remove as any hack from artifacts in contracts package --- packages/contracts/globals.d.ts | 6 --- packages/contracts/src/artifacts/index.ts | 72 ++++++++++++++++--------------- packages/contracts/tsconfig.json | 2 +- 3 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 packages/contracts/globals.d.ts (limited to 'packages') diff --git a/packages/contracts/globals.d.ts b/packages/contracts/globals.d.ts deleted file mode 100644 index 94e63a32d..000000000 --- a/packages/contracts/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/contracts/src/artifacts/index.ts b/packages/contracts/src/artifacts/index.ts index a9cd31ea2..c30972a91 100644 --- a/packages/contracts/src/artifacts/index.ts +++ b/packages/contracts/src/artifacts/index.ts @@ -38,40 +38,42 @@ import * as Whitelist from '../../generated-artifacts/Whitelist.json'; import * as ZRXToken from '../../generated-artifacts/ZRXToken.json'; export const artifacts = { - AssetProxyOwner: (AssetProxyOwner as any) as ContractArtifact, - DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, - DummyERC721Receiver: (DummyERC721Receiver as any) as ContractArtifact, - DummyERC721Token: (DummyERC721Token as any) as ContractArtifact, - DummyMultipleReturnERC20Token: (DummyMultipleReturnERC20Token as any) as ContractArtifact, - DummyNoReturnERC20Token: (DummyNoReturnERC20Token as any) as ContractArtifact, - ERC20Proxy: (ERC20Proxy as any) as ContractArtifact, - ERC20Token: (ERC20Token as any) as ContractArtifact, - ERC721Proxy: (ERC721Proxy as any) as ContractArtifact, - ERC721Token: (ERC721Token as any) as ContractArtifact, - Exchange: (Exchange as any) as ContractArtifact, - ExchangeWrapper: (ExchangeWrapper as any) as ContractArtifact, - Forwarder: (Forwarder as any) as ContractArtifact, - IAssetData: (IAssetData as any) as ContractArtifact, - IAssetProxy: (IAssetProxy as any) as ContractArtifact, - IValidator: (IValidator as any) as ContractArtifact, - IWallet: (IWallet as any) as ContractArtifact, - InvalidERC721Receiver: (InvalidERC721Receiver as any) as ContractArtifact, - MixinAuthorizable: (MixinAuthorizable as any) as ContractArtifact, - MultiSigWallet: (MultiSigWallet as any) as ContractArtifact, - MultiSigWalletWithTimeLock: (MultiSigWalletWithTimeLock as any) as ContractArtifact, - OrderValidator: (OrderValidator as any) as ContractArtifact, - ReentrantERC20Token: (ReentrantERC20Token as any) as ContractArtifact, - TestAssetProxyDispatcher: (TestAssetProxyDispatcher as any) as ContractArtifact, - TestAssetProxyOwner: (TestAssetProxyOwner as any) as ContractArtifact, - TestConstants: (TestConstants as any) as ContractArtifact, - TestExchangeInternals: (TestExchangeInternals as any) as ContractArtifact, - TestLibBytes: (TestLibBytes as any) as ContractArtifact, - TestLibs: (TestLibs as any) as ContractArtifact, - TestSignatureValidator: (TestSignatureValidator as any) as ContractArtifact, - TestStaticCallReceiver: (TestStaticCallReceiver as any) as ContractArtifact, - Validator: (Validator as any) as ContractArtifact, - WETH9: (WETH9 as any) as ContractArtifact, - Wallet: (Wallet as any) as ContractArtifact, - Whitelist: (Whitelist as any) as ContractArtifact, + AssetProxyOwner: AssetProxyOwner as ContractArtifact, + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, + DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + ERC20Proxy: ERC20Proxy as ContractArtifact, + ERC20Token: ERC20Token as ContractArtifact, + ERC721Proxy: ERC721Proxy as ContractArtifact, + ERC721Token: ERC721Token as ContractArtifact, + Exchange: Exchange as ContractArtifact, + ExchangeWrapper: ExchangeWrapper as ContractArtifact, + Forwarder: Forwarder as ContractArtifact, + IAssetData: IAssetData as ContractArtifact, + IAssetProxy: IAssetProxy as ContractArtifact, + IValidator: IValidator as ContractArtifact, + IWallet: IWallet as ContractArtifact, + InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact, + MixinAuthorizable: MixinAuthorizable as ContractArtifact, + MultiSigWallet: MultiSigWallet as ContractArtifact, + MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact, + OrderValidator: OrderValidator as ContractArtifact, + ReentrantERC20Token: ReentrantERC20Token as ContractArtifact, + TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact, + TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact, + TestConstants: TestConstants as ContractArtifact, + TestExchangeInternals: TestExchangeInternals as ContractArtifact, + TestLibBytes: TestLibBytes as ContractArtifact, + TestLibs: TestLibs as ContractArtifact, + TestSignatureValidator: TestSignatureValidator as ContractArtifact, + TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact, + Validator: Validator as ContractArtifact, + WETH9: WETH9 as ContractArtifact, + Wallet: Wallet as ContractArtifact, + Whitelist: Whitelist as ContractArtifact, + // Note(albrow): "as any" hack still required here because ZRXToken does not + // conform to the v2 artifact type. ZRXToken: (ZRXToken as any) as ContractArtifact, }; diff --git a/packages/contracts/tsconfig.json b/packages/contracts/tsconfig.json index e219c76fe..8b29365cc 100644 --- a/packages/contracts/tsconfig.json +++ b/packages/contracts/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": ".", "resolveJsonModule": true }, - "include": ["./globals.d.ts", "./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], + "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ "./generated-artifacts/AssetProxyOwner.json", "./generated-artifacts/DummyERC20Token.json", -- cgit v1.2.3