diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-08 00:52:14 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 00:52:14 +0800 |
| commit | b646c8441467212e60f03c868a55d6ab70720aba (patch) | |
| tree | 4292c665d7d2943ae9817ab387530b7aa039b2b1 /packages/contracts/test | |
| parent | 7b7664bd6607852ea97ef5463b3681db8aaf4a89 (diff) | |
| parent | a200eaacaa3975b63f24d8be6cdfc7b0921d91ef (diff) | |
| download | dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar.gz dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar.bz2 dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar.lz dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar.xz dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.tar.zst dexon-sol-tools-b646c8441467212e60f03c868a55d6ab70720aba.zip | |
Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatorial-testing
* fix/order-utils/remaining-v2-changes:
Fix tslint failure
Pass in fee and assetAmount rather then the whole signedOrder
Diffstat (limited to 'packages/contracts/test')
| -rw-r--r-- | packages/contracts/test/libraries/lib_bytes.ts | 2 | ||||
| -rw-r--r-- | packages/contracts/test/unlimited_allowance_token.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/test/libraries/lib_bytes.ts b/packages/contracts/test/libraries/lib_bytes.ts index dea45049e..baac497e8 100644 --- a/packages/contracts/test/libraries/lib_bytes.ts +++ b/packages/contracts/test/libraries/lib_bytes.ts @@ -6,7 +6,7 @@ import ethUtil = require('ethereumjs-util'); import { TestLibBytesContract } from '../../src/contract_wrappers/generated/test_lib_bytes'; import { artifacts } from '../../src/utils/artifacts'; -import { expectRevertOrAlwaysFailingTransactionAsync, expectRevertOrOtherErrorAsync } from '../../src/utils/assertions'; +import { expectRevertOrOtherErrorAsync } from '../../src/utils/assertions'; import { chaiSetup } from '../../src/utils/chai_setup'; import { constants } from '../../src/utils/constants'; import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper'; diff --git a/packages/contracts/test/unlimited_allowance_token.ts b/packages/contracts/test/unlimited_allowance_token.ts index ac232d8ff..ae9e80270 100644 --- a/packages/contracts/test/unlimited_allowance_token.ts +++ b/packages/contracts/test/unlimited_allowance_token.ts @@ -5,7 +5,7 @@ import 'make-promises-safe'; import { DummyERC20TokenContract } from '../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { artifacts } from '../src/utils/artifacts'; -import { expectRevertOrAlwaysFailingTransactionAsync, expectRevertOrOtherErrorAsync } from '../src/utils/assertions'; +import { expectRevertOrOtherErrorAsync } from '../src/utils/assertions'; import { chaiSetup } from '../src/utils/chai_setup'; import { constants } from '../src/utils/constants'; import { provider, txDefaults, web3Wrapper } from '../src/utils/web3_wrapper'; |