diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-09-08 02:28:45 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-09-08 02:28:45 +0800 |
commit | af217e316a76eef0365123722ba999907a6fcdcb (patch) | |
tree | 8192b41455610deccecf92c286b523f2942d3575 | |
parent | b5435b6ab8c91ddc48c16235c956a38ef5c906d0 (diff) | |
download | dexon-0x-contracts-af217e316a76eef0365123722ba999907a6fcdcb.tar.gz dexon-0x-contracts-af217e316a76eef0365123722ba999907a6fcdcb.tar.zst dexon-0x-contracts-af217e316a76eef0365123722ba999907a6fcdcb.zip |
Move Aftifact type definition to 'types'
-rw-r--r-- | src/artifacts.ts | 1 | ||||
-rw-r--r-- | src/contract_wrappers/contract_wrapper.ts | 2 | ||||
-rw-r--r-- | src/globals.d.ts | 7 | ||||
-rw-r--r-- | src/types.ts | 7 | ||||
-rw-r--r-- | src/web3_wrapper.ts | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/src/artifacts.ts b/src/artifacts.ts index 0c4627337..447f9880a 100644 --- a/src/artifacts.ts +++ b/src/artifacts.ts @@ -1,3 +1,4 @@ +import {Artifact} from './types'; import * as TokenArtifact from './artifacts/Token.json'; import * as ExchangeArtifact from './artifacts/Exchange.json'; import * as EtherTokenArtifact from './artifacts/EtherToken.json'; diff --git a/src/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts index ca19342f3..4e3fb5029 100644 --- a/src/contract_wrappers/contract_wrapper.ts +++ b/src/contract_wrappers/contract_wrapper.ts @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import * as Web3 from 'web3'; import {Web3Wrapper} from '../web3_wrapper'; -import {ZeroExError} from '../types'; +import {ZeroExError, Artifact} from '../types'; import {utils} from '../utils/utils'; export class ContractWrapper { diff --git a/src/globals.d.ts b/src/globals.d.ts index 467a756a4..05d7131c2 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -33,13 +33,6 @@ declare module '*.json' { /* tslint:enable */ } -declare interface Artifact { - abi: any; - networks: {[networkId: number]: { - address: string; - }}; -} - // find-version declarations declare function findVersions(version: string): string[]; declare module 'find-versions' { diff --git a/src/types.ts b/src/types.ts index 7e370e3f1..c1ba0a5cc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -412,3 +412,10 @@ export interface LogWithDecodedArgs extends Web3.LogEntry, DecodedArgs {} export interface TransactionReceiptWithDecodedLogs extends Web3.TransactionReceipt { logs: Array<LogWithDecodedArgs|Web3.LogEntry>; } + +export interface Artifact { + abi: any; + networks: {[networkId: number]: { + address: string; + }}; +} diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts index 7b9a28a7d..0bf80a6e4 100644 --- a/src/web3_wrapper.ts +++ b/src/web3_wrapper.ts @@ -2,7 +2,7 @@ import * as _ from 'lodash'; import * as Web3 from 'web3'; import * as BigNumber from 'bignumber.js'; import promisify = require('es6-promisify'); -import {ZeroExError} from './types'; +import {ZeroExError, Artifact} from './types'; import {Contract} from './contract'; export class Web3Wrapper { |