aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-12-04 20:25:37 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-12-04 20:25:37 +0800
commit6d312f0230207bee861f6604bc0d134e09ad4ba8 (patch)
tree76a2618161ac0a70b2a72e469a087002c3be757d
parent240a8a50d3ae3e76a36c170c28b3e130cc3d7cd0 (diff)
downloaddexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar.gz
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar.bz2
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar.lz
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar.xz
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.tar.zst
dexon-sol-tools-6d312f0230207bee861f6604bc0d134e09ad4ba8.zip
Fix merge conflict
-rw-r--r--contracts/core/test/extensions/dutch_auction.ts19
1 files changed, 12 insertions, 7 deletions
diff --git a/contracts/core/test/extensions/dutch_auction.ts b/contracts/core/test/extensions/dutch_auction.ts
index c133d8c60..6bed222f4 100644
--- a/contracts/core/test/extensions/dutch_auction.ts
+++ b/contracts/core/test/extensions/dutch_auction.ts
@@ -1,3 +1,15 @@
+import {
+ chaiSetup,
+ constants,
+ ContractName,
+ ERC20BalancesByOwner,
+ expectTransactionFailedAsync,
+ getLatestBlockTimestampAsync,
+ OrderFactory,
+ provider,
+ txDefaults,
+ web3Wrapper,
+} from '@0x/contracts-test-utils';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
import { RevertReason, SignedOrder } from '@0x/types';
@@ -14,16 +26,9 @@ import { DutchAuctionContract } from '../../generated-wrappers/dutch_auction';
import { ExchangeContract } from '../../generated-wrappers/exchange';
import { WETH9Contract } from '../../generated-wrappers/weth9';
import { artifacts } from '../../src/artifacts';
-import { expectTransactionFailedAsync } from '../utils/assertions';
-import { getLatestBlockTimestampAsync } from '../utils/block_timestamp';
-import { chaiSetup } from '../utils/chai_setup';
-import { constants } from '../utils/constants';
import { ERC20Wrapper } from '../utils/erc20_wrapper';
import { ERC721Wrapper } from '../utils/erc721_wrapper';
import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { OrderFactory } from '../utils/order_factory';
-import { ContractName, ERC20BalancesByOwner } from '../utils/types';
-import { provider, txDefaults, web3Wrapper } from '../utils/web3_wrapper';
chaiSetup.configure();
const expect = chai.expect;