diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-05 21:23:35 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-05 22:21:03 +0800 |
commit | a365ab11d24ff8365b7d69a948b1b5211b772f5e (patch) | |
tree | a5b6f7f83957ee578323d66a00f0b5f233518192 /contracts/core/test/exchange/signature_validator.ts | |
parent | 48021a227f7034c2238c64146b2eb05eb8bfb687 (diff) | |
download | dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.gz dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.bz2 dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.lz dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.xz dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.zst dexon-sol-tools-a365ab11d24ff8365b7d69a948b1b5211b772f5e.zip |
Refactor out tokens from core contracts package
Diffstat (limited to 'contracts/core/test/exchange/signature_validator.ts')
-rw-r--r-- | contracts/core/test/exchange/signature_validator.ts | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/core/test/exchange/signature_validator.ts index b84a488a1..ae372d677 100644 --- a/contracts/core/test/exchange/signature_validator.ts +++ b/contracts/core/test/exchange/signature_validator.ts @@ -9,6 +9,7 @@ import { txDefaults, web3Wrapper, } from '@0x/contracts-test-utils'; +import { artifacts as tokensArtifacts } from '@0x/contracts-tokens'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils'; import { RevertReason, SignatureType, SignedOrder } from '@0x/types'; @@ -17,13 +18,13 @@ import { LogWithDecodedArgs } from 'ethereum-types'; import ethUtil = require('ethereumjs-util'); import { + artifacts, TestSignatureValidatorContract, TestSignatureValidatorSignatureValidatorApprovalEventArgs, -} from '../../generated-wrappers/test_signature_validator'; -import { TestStaticCallReceiverContract } from '../../generated-wrappers/test_static_call_receiver'; -import { ValidatorContract } from '../../generated-wrappers/validator'; -import { WalletContract } from '../../generated-wrappers/wallet'; -import { artifacts } from '../../src/artifacts'; + TestStaticCallReceiverContract, + ValidatorContract, + WalletContract, +} from '../../src'; chaiSetup.configure(); const expect = chai.expect; @@ -77,7 +78,7 @@ describe('MixinSignatureValidator', () => { provider, txDefaults, ); - signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts); + signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokensArtifacts }); await web3Wrapper.awaitTransactionSuccessAsync( await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, { from: signerAddress, |