diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-11 02:53:25 +0800 |
|---|---|---|
| committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-13 01:19:32 +0800 |
| commit | e8231767ec870c55181d9dfc687639d9d927ba75 (patch) | |
| tree | 3d55aa8ad5b5e2f768e7a6493d518a874abd5441 /contracts/core/test/exchange | |
| parent | 2b7dabeb6e6c0baca8bc36fe19e39dd4000801b2 (diff) | |
| download | dexon-0x-contracts-e8231767ec870c55181d9dfc687639d9d927ba75.tar.gz dexon-0x-contracts-e8231767ec870c55181d9dfc687639d9d927ba75.tar.zst dexon-0x-contracts-e8231767ec870c55181d9dfc687639d9d927ba75.zip | |
Refactor our extensions package
Diffstat (limited to 'contracts/core/test/exchange')
| -rw-r--r-- | contracts/core/test/exchange/signature_validator.ts | 8 | ||||
| -rw-r--r-- | contracts/core/test/exchange/transactions.ts | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/core/test/exchange/signature_validator.ts index a968570b6..9d154d30a 100644 --- a/contracts/core/test/exchange/signature_validator.ts +++ b/contracts/core/test/exchange/signature_validator.ts @@ -1,3 +1,5 @@ +import { ValidatorContract, WalletContract } from '@0x/contracts-examples'; +import { artifacts as examplesArtifacts } from '@0x/contracts-examples'; import { addressUtils, chaiSetup, @@ -22,8 +24,6 @@ import { TestSignatureValidatorContract, TestSignatureValidatorSignatureValidatorApprovalEventArgs, TestStaticCallReceiverContract, - ValidatorContract, - WalletContract, } from '../../src'; chaiSetup.configure(); @@ -62,13 +62,13 @@ describe('MixinSignatureValidator', () => { txDefaults, ); testWallet = await WalletContract.deployFrom0xArtifactAsync( - artifacts.Wallet, + examplesArtifacts.Wallet, provider, txDefaults, signerAddress, ); testValidator = await ValidatorContract.deployFrom0xArtifactAsync( - artifacts.Validator, + examplesArtifacts.Validator, provider, txDefaults, signerAddress, diff --git a/contracts/core/test/exchange/transactions.ts b/contracts/core/test/exchange/transactions.ts index ad0ca41c2..746f3cb04 100644 --- a/contracts/core/test/exchange/transactions.ts +++ b/contracts/core/test/exchange/transactions.ts @@ -1,3 +1,4 @@ +import { artifacts as examplesArtifacts, ExchangeWrapperContract, WhitelistContract } from '@0x/contracts-examples'; import { chaiSetup, constants, @@ -21,8 +22,6 @@ import * as _ from 'lodash'; import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy'; import { ExchangeContract } from '../../generated-wrappers/exchange'; -import { ExchangeWrapperContract } from '../../generated-wrappers/exchange_wrapper'; -import { WhitelistContract } from '../../generated-wrappers/whitelist'; import { artifacts } from '../../src/artifacts'; import { ERC20Wrapper } from '../utils/erc20_wrapper'; import { ExchangeWrapper } from '../utils/exchange_wrapper'; @@ -222,7 +221,7 @@ describe('Exchange transactions', () => { before(async () => { exchangeWrapperContract = await ExchangeWrapperContract.deployFrom0xArtifactAsync( - artifacts.ExchangeWrapper, + examplesArtifacts.ExchangeWrapper, provider, txDefaults, exchange.address, @@ -336,7 +335,7 @@ describe('Exchange transactions', () => { before(async () => { whitelist = await WhitelistContract.deployFrom0xArtifactAsync( - artifacts.Whitelist, + examplesArtifacts.Whitelist, provider, txDefaults, exchange.address, |