aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-05-25 07:18:44 +0800
committerGitHub <noreply@github.com>2018-05-25 07:18:44 +0800
commitc4a7574f7bd3939eac9417241144197bbb22edb1 (patch)
tree4f2d13872c3c8063373a56d1112c3f3ceb27f733 /packages/contracts/test/exchange/transactions.ts
parent4ee636ecca20d2744a7d133194aa950f3f6fb833 (diff)
parent3e907d7f4fddcb9ae5438b5676bf9ecd99007909 (diff)
downloaddexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.gz
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.bz2
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.lz
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.xz
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.tar.zst
dexon-sol-tools-c4a7574f7bd3939eac9417241144197bbb22edb1.zip
Merge pull request #618 from 0xProject/feature/v2-migrations
Migrate migrations, types to v2
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
-rw-r--r--packages/contracts/test/exchange/transactions.ts5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 24f7230fa..33fe11bfa 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -1,4 +1,5 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
+import { Order, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import * as ethUtil from 'ethereumjs-util';
@@ -20,9 +21,7 @@ import {
AssetProxyId,
ERC20BalancesByOwner,
ExchangeStatus,
- OrderStruct,
SignatureType,
- SignedOrder,
SignedTransaction,
} from '../../src/utils/types';
import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper';
@@ -47,7 +46,7 @@ describe('Exchange transactions', () => {
let erc20Balances: ERC20BalancesByOwner;
let signedOrder: SignedOrder;
let signedTx: SignedTransaction;
- let order: OrderStruct;
+ let order: Order;
let orderFactory: OrderFactory;
let makerTransactionFactory: TransactionFactory;
let takerTransactionFactory: TransactionFactory;