diff options
| author | Fabio Berger <me@fabioberger.com> | 2019-02-07 22:28:24 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2019-02-07 22:28:24 +0800 |
| commit | 3dd652e7cf6da63831da143b73c13231a46da376 (patch) | |
| tree | 52218d0b88717360fa8bfadf4bbf7e35b9ab5f66 /contracts/exchange/test/signature_validator.ts | |
| parent | 8de955f3d891620c90c668b4ac0b046e772d4da8 (diff) | |
| parent | f003298ce4c7a2201d2d59685b0d5d0411aeb55d (diff) | |
| download | dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.gz dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.zst dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.zip | |
Merge branch 'development' into addAnalyticsToDevToolsPages
* development: (51 commits)
Publish
Updated CHANGELOGS
Updated CHANGELOGS
Update packages/sol-compiler/CHANGELOG.json
Update packages/sol-compiler/CHANGELOG.json
Move from devDep to dep
Fix linter
Update CHANGELOG
Re-run yarn since fails again on first run
Add PR numbers
Omit remapping in compiler settings equality checks
Omit remapping in compiler settings equality checks
Fix a bug when ast and legacyAST were not present in the artifacts even if requested
Update yarn.lock
Remove the bin_paths and fetch the solidity release list from github repo
Remove postinstall hack
Fix the undefined opts bug
Fix sol-compiler bug with remappings causing smart recompilation to now work
re-add postinstall hack
Fix deps versions
...
Diffstat (limited to 'contracts/exchange/test/signature_validator.ts')
| -rw-r--r-- | contracts/exchange/test/signature_validator.ts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contracts/exchange/test/signature_validator.ts b/contracts/exchange/test/signature_validator.ts index 89eac4ddb..33510e50c 100644 --- a/contracts/exchange/test/signature_validator.ts +++ b/contracts/exchange/test/signature_validator.ts @@ -1,4 +1,3 @@ -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; import { addressUtils, chaiSetup, @@ -78,7 +77,7 @@ describe('MixinSignatureValidator', () => { provider, txDefaults, ); - signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts }); + signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, artifacts); await web3Wrapper.awaitTransactionSuccessAsync( await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, { from: signerAddress, |