diff options
22 files changed, 54 insertions, 59 deletions
diff --git a/packages/contracts/util/artifacts.ts b/packages/contracts/src/utils/artifacts.ts index 7c375c1b7..fd9380d1d 100644 --- a/packages/contracts/util/artifacts.ts +++ b/packages/contracts/src/utils/artifacts.ts @@ -1,13 +1,13 @@ -import * as DummyTokenArtifact from '../src/artifacts/DummyToken.json'; -import * as ExchangeArtifact from '../src/artifacts/Exchange.json'; -import * as MaliciousTokenArtifact from '../src/artifacts/MaliciousToken.json'; -import * as MultiSigWalletWithTimeLockArtifact from '../src/artifacts/MultiSigWalletWithTimeLock.json'; -import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../src/artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json'; -import * as TokenArtifact from '../src/artifacts/Token.json'; -import * as TokenRegistryArtifact from '../src/artifacts/TokenRegistry.json'; -import * as TokenTransferProxyArtifact from '../src/artifacts/TokenTransferProxy.json'; -import * as EtherTokenArtifact from '../src/artifacts/WETH9.json'; -import * as ZRXArtifact from '../src/artifacts/ZRXToken.json'; +import * as DummyTokenArtifact from '../artifacts/DummyToken.json'; +import * as ExchangeArtifact from '../artifacts/Exchange.json'; +import * as MaliciousTokenArtifact from '../artifacts/MaliciousToken.json'; +import * as MultiSigWalletWithTimeLockArtifact from '../artifacts/MultiSigWalletWithTimeLock.json'; +import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressArtifact from '../artifacts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json'; +import * as TokenArtifact from '../artifacts/Token.json'; +import * as TokenRegistryArtifact from '../artifacts/TokenRegistry.json'; +import * as TokenTransferProxyArtifact from '../artifacts/TokenTransferProxy.json'; +import * as EtherTokenArtifact from '../artifacts/WETH9.json'; +import * as ZRXArtifact from '../artifacts/ZRXToken.json'; import { Artifact } from './types'; diff --git a/packages/contracts/util/balances.ts b/packages/contracts/src/utils/balances.ts index d03d4b3c5..2ebc10313 100644 --- a/packages/contracts/util/balances.ts +++ b/packages/contracts/src/utils/balances.ts @@ -2,7 +2,7 @@ import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; import * as Web3 from 'web3'; -import { DummyTokenContract } from '../src/contract_wrappers/generated/dummy_token'; +import { DummyTokenContract } from '../contract_wrappers/generated/dummy_token'; import { BalancesByOwner } from './types'; diff --git a/packages/contracts/util/constants.ts b/packages/contracts/src/utils/constants.ts index d1152e683..d1152e683 100644 --- a/packages/contracts/util/constants.ts +++ b/packages/contracts/src/utils/constants.ts diff --git a/packages/contracts/util/crypto.ts b/packages/contracts/src/utils/crypto.ts index 810072d2f..810072d2f 100644 --- a/packages/contracts/util/crypto.ts +++ b/packages/contracts/src/utils/crypto.ts diff --git a/packages/contracts/util/exchange_wrapper.ts b/packages/contracts/src/utils/exchange_wrapper.ts index d51efc025..75b452b04 100644 --- a/packages/contracts/util/exchange_wrapper.ts +++ b/packages/contracts/src/utils/exchange_wrapper.ts @@ -3,7 +3,7 @@ import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; import * as Web3 from 'web3'; -import { ExchangeContract } from '../src/contract_wrappers/generated/exchange'; +import { ExchangeContract } from '../contract_wrappers/generated/exchange'; import { formatters } from './formatters'; import { signedOrderUtils } from './signed_order_utils'; diff --git a/packages/contracts/util/formatters.ts b/packages/contracts/src/utils/formatters.ts index 88e12a6b4..88e12a6b4 100644 --- a/packages/contracts/util/formatters.ts +++ b/packages/contracts/src/utils/formatters.ts diff --git a/packages/contracts/util/multi_sig_wrapper.ts b/packages/contracts/src/utils/multi_sig_wrapper.ts index 9f6dcec52..84fed7944 100644 --- a/packages/contracts/util/multi_sig_wrapper.ts +++ b/packages/contracts/src/utils/multi_sig_wrapper.ts @@ -5,7 +5,7 @@ import ethUtil = require('ethereumjs-util'); import * as _ from 'lodash'; import * as Web3 from 'web3'; -import { MultiSigWalletContract } from '../src/contract_wrappers/generated/multi_sig_wallet'; +import { MultiSigWalletContract } from '../contract_wrappers/generated/multi_sig_wallet'; import { TransactionDataParams } from './types'; diff --git a/packages/contracts/util/order_factory.ts b/packages/contracts/src/utils/order_factory.ts index 8ba5df24a..8ba5df24a 100644 --- a/packages/contracts/util/order_factory.ts +++ b/packages/contracts/src/utils/order_factory.ts diff --git a/packages/contracts/util/token_registry_wrapper.ts b/packages/contracts/src/utils/token_registry_wrapper.ts index d78c8a64e..91bd5503d 100644 --- a/packages/contracts/util/token_registry_wrapper.ts +++ b/packages/contracts/src/utils/token_registry_wrapper.ts @@ -1,6 +1,6 @@ import * as Web3 from 'web3'; -import { TokenRegistryContract } from '../src/contract_wrappers/generated/token_registry'; +import { TokenRegistryContract } from '../contract_wrappers/generated/token_registry'; import { Token } from './types'; diff --git a/packages/contracts/util/types.ts b/packages/contracts/src/utils/types.ts index 2ffc84f04..2ffc84f04 100644 --- a/packages/contracts/util/types.ts +++ b/packages/contracts/src/utils/types.ts diff --git a/packages/contracts/test/ether_token.ts b/packages/contracts/test/ether_token.ts index 4023abad0..e9aba07c5 100644 --- a/packages/contracts/test/ether_token.ts +++ b/packages/contracts/test/ether_token.ts @@ -4,8 +4,8 @@ import { BigNumber, promisify } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; -import { constants } from '../util/constants'; -import { ContractName } from '../util/types'; +import { constants } from '../src/utils/constants'; +import { ContractName } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 4fd837d51..a1758457b 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -15,12 +15,12 @@ import { LogFillContractEventArgs, } from '../../src/contract_wrappers/generated/exchange'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; -import { Balances } from '../../util/balances'; -import { constants } from '../../util/constants'; -import { crypto } from '../../util/crypto'; -import { ExchangeWrapper } from '../../util/exchange_wrapper'; -import { OrderFactory } from '../../util/order_factory'; -import { BalancesByOwner, ContractName, ExchangeContractErrs } from '../../util/types'; +import { Balances } from '../../src/utils/balances'; +import { constants } from '../../src/utils/constants'; +import { crypto } from '../../src/utils/crypto'; +import { ExchangeWrapper } from '../../src/utils/exchange_wrapper'; +import { OrderFactory } from '../../src/utils/order_factory'; +import { BalancesByOwner, ContractName, ExchangeContractErrs } from '../../src/utils/types'; import { chaiSetup } from '../utils/chai_setup'; import { deployer } from '../utils/deployer'; import { provider, web3Wrapper } from '../utils/web3_wrapper'; diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts index 8fc30c0b5..d41f37446 100644 --- a/packages/contracts/test/exchange/helpers.ts +++ b/packages/contracts/test/exchange/helpers.ts @@ -5,16 +5,11 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import ethUtil = require('ethereumjs-util'); -import { - ExchangeContract, - LogCancelContractEventArgs, - LogErrorContractEventArgs, - LogFillContractEventArgs, -} from '../../src/contract_wrappers/generated/exchange'; -import { constants } from '../../util/constants'; -import { ExchangeWrapper } from '../../util/exchange_wrapper'; -import { OrderFactory } from '../../util/order_factory'; -import { ContractName } from '../../util/types'; +import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; +import { constants } from '../../src/utils/constants'; +import { ExchangeWrapper } from '../../src/utils/exchange_wrapper'; +import { OrderFactory } from '../../src/utils/order_factory'; +import { ContractName } from '../../src/utils/types'; import { chaiSetup } from '../utils/chai_setup'; import { deployer } from '../utils/deployer'; import { provider, web3Wrapper } from '../utils/web3_wrapper'; diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index 440fd0517..2a803e2ac 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -15,11 +15,11 @@ import { } from '../../src/contract_wrappers/generated/exchange'; import { TokenRegistryContract } from '../../src/contract_wrappers/generated/token_registry'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; -import { Balances } from '../../util/balances'; -import { constants } from '../../util/constants'; -import { ExchangeWrapper } from '../../util/exchange_wrapper'; -import { OrderFactory } from '../../util/order_factory'; -import { BalancesByOwner, ContractName } from '../../util/types'; +import { Balances } from '../../src/utils/balances'; +import { constants } from '../../src/utils/constants'; +import { ExchangeWrapper } from '../../src/utils/exchange_wrapper'; +import { OrderFactory } from '../../src/utils/order_factory'; +import { BalancesByOwner, ContractName } from '../../src/utils/types'; import { chaiSetup } from '../utils/chai_setup'; import { deployer } from '../utils/deployer'; import { provider, web3Wrapper } from '../utils/web3_wrapper'; diff --git a/packages/contracts/test/multi_sig_with_time_lock.ts b/packages/contracts/test/multi_sig_with_time_lock.ts index b7604457f..48600ae3d 100644 --- a/packages/contracts/test/multi_sig_with_time_lock.ts +++ b/packages/contracts/test/multi_sig_with_time_lock.ts @@ -8,10 +8,10 @@ import * as Web3 from 'web3'; import * as multiSigWalletJSON from '../../build/contracts/MultiSigWalletWithTimeLock.json'; import { MultiSigWalletContract } from '../src/contract_wrappers/generated/multi_sig_wallet'; import { MultiSigWalletWithTimeLockContract } from '../src/contract_wrappers/generated/multi_sig_wallet_with_time_lock'; -import { artifacts } from '../util/artifacts'; -import { constants } from '../util/constants'; -import { MultiSigWrapper } from '../util/multi_sig_wrapper'; -import { ContractName, SubmissionContractEventArgs } from '../util/types'; +import { artifacts } from '../src/utils/artifacts'; +import { constants } from '../src/utils/constants'; +import { MultiSigWrapper } from '../src/utils/multi_sig_wrapper'; +import { ContractName, SubmissionContractEventArgs } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; diff --git a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts index 2f928ede2..f29d26fca 100644 --- a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts +++ b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts @@ -8,11 +8,11 @@ import * as Web3 from 'web3'; import { MultiSigWalletContract } from '../src/contract_wrappers/generated/multi_sig_wallet'; import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from '../src/contract_wrappers/generated/multi_sig_wallet_with_time_lock_except_remove_authorized_address'; import { TokenTransferProxyContract } from '../src/contract_wrappers/generated/token_transfer_proxy'; -import { artifacts } from '../util/artifacts'; -import { constants } from '../util/constants'; -import { crypto } from '../util/crypto'; -import { MultiSigWrapper } from '../util/multi_sig_wrapper'; -import { ContractName, SubmissionContractEventArgs, TransactionDataParams } from '../util/types'; +import { artifacts } from '../src/utils/artifacts'; +import { constants } from '../src/utils/constants'; +import { crypto } from '../src/utils/crypto'; +import { MultiSigWrapper } from '../src/utils/multi_sig_wrapper'; +import { ContractName, SubmissionContractEventArgs, TransactionDataParams } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; diff --git a/packages/contracts/test/token_registry.ts b/packages/contracts/test/token_registry.ts index 4c404176b..c34478b65 100644 --- a/packages/contracts/test/token_registry.ts +++ b/packages/contracts/test/token_registry.ts @@ -8,9 +8,9 @@ import * as _ from 'lodash'; import * as Web3 from 'web3'; import { TokenRegistryContract } from '../src/contract_wrappers/generated/token_registry'; -import { constants } from '../util/constants'; -import { TokenRegWrapper } from '../util/token_registry_wrapper'; -import { ContractName } from '../util/types'; +import { constants } from '../src/utils/constants'; +import { TokenRegWrapper } from '../src/utils/token_registry_wrapper'; +import { ContractName } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; diff --git a/packages/contracts/test/token_transfer_proxy/auth.ts b/packages/contracts/test/token_transfer_proxy/auth.ts index 885ff3bc1..dc9eae4ff 100644 --- a/packages/contracts/test/token_transfer_proxy/auth.ts +++ b/packages/contracts/test/token_transfer_proxy/auth.ts @@ -4,8 +4,8 @@ import * as chai from 'chai'; import * as Web3 from 'web3'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; -import { constants } from '../../util/constants'; -import { ContractName } from '../../util/types'; +import { constants } from '../../src/utils/constants'; +import { ContractName } from '../../src/utils/types'; import { chaiSetup } from '../utils/chai_setup'; import { deployer } from '../utils/deployer'; import { provider, web3Wrapper } from '../utils/web3_wrapper'; diff --git a/packages/contracts/test/token_transfer_proxy/transfer_from.ts b/packages/contracts/test/token_transfer_proxy/transfer_from.ts index dff1a0cfb..dc6757cd9 100644 --- a/packages/contracts/test/token_transfer_proxy/transfer_from.ts +++ b/packages/contracts/test/token_transfer_proxy/transfer_from.ts @@ -6,9 +6,9 @@ import * as Web3 from 'web3'; import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; -import { Balances } from '../../util/balances'; -import { constants } from '../../util/constants'; -import { ContractName } from '../../util/types'; +import { Balances } from '../../src/utils/balances'; +import { constants } from '../../src/utils/constants'; +import { ContractName } from '../../src/utils/types'; import { chaiSetup } from '../utils/chai_setup'; import { deployer } from '../utils/deployer'; import { provider, web3Wrapper } from '../utils/web3_wrapper'; diff --git a/packages/contracts/test/unlimited_allowance_token.ts b/packages/contracts/test/unlimited_allowance_token.ts index 618bda72d..50d5c4d03 100644 --- a/packages/contracts/test/unlimited_allowance_token.ts +++ b/packages/contracts/test/unlimited_allowance_token.ts @@ -6,8 +6,8 @@ import * as chai from 'chai'; import * as Web3 from 'web3'; import { DummyTokenContract } from '../src/contract_wrappers/generated/dummy_token'; -import { constants } from '../util/constants'; -import { ContractName } from '../util/types'; +import { constants } from '../src/utils/constants'; +import { ContractName } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; diff --git a/packages/contracts/test/utils/deployer.ts b/packages/contracts/test/utils/deployer.ts index 2f0951475..967cdd903 100644 --- a/packages/contracts/test/utils/deployer.ts +++ b/packages/contracts/test/utils/deployer.ts @@ -2,7 +2,7 @@ import { Deployer } from '@0xproject/deployer'; import { devConstants } from '@0xproject/dev-utils'; import * as path from 'path'; -import { constants } from '../../util/constants'; +import { constants } from '../../src/utils/constants'; import { web3 } from './web3_wrapper'; diff --git a/packages/contracts/test/zrx_token.ts b/packages/contracts/test/zrx_token.ts index b01615b39..259b4310e 100644 --- a/packages/contracts/test/zrx_token.ts +++ b/packages/contracts/test/zrx_token.ts @@ -6,8 +6,8 @@ import * as chai from 'chai'; import * as Web3 from 'web3'; import { ZRXTokenContract } from '../src/contract_wrappers/generated/zrx_token'; -import { constants } from '../util/constants'; -import { ContractName } from '../util/types'; +import { constants } from '../src/utils/constants'; +import { ContractName } from '../src/utils/types'; import { chaiSetup } from './utils/chai_setup'; import { deployer } from './utils/deployer'; |