diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
commit | 5aaf87d61260ec4723e7eb0a887629b057454957 (patch) | |
tree | 0637dfabfec4e71f5cc7d3b2f46712572bb58ce0 /packages/contracts/test/tutorials/arbitrage.ts | |
parent | 10478a6b2fd1f2a01597a88afde9cf582640a849 (diff) | |
parent | 96b31f39749fb32bd89978245c79aa637791336c (diff) | |
download | dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.gz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.bz2 dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.lz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.xz dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.tar.zst dexon-sol-tools-5aaf87d61260ec4723e7eb0a887629b057454957.zip |
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype:
Fix tslint issues
Fix tslint failure
Pass in fee and assetAmount rather then the whole signedOrder
Fix missing paths
Revert to returning orderState on invalid order
- Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming
Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to 'packages/contracts/test/tutorials/arbitrage.ts')
-rw-r--r-- | packages/contracts/test/tutorials/arbitrage.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/test/tutorials/arbitrage.ts b/packages/contracts/test/tutorials/arbitrage.ts index df01f31bb..32fcedb43 100644 --- a/packages/contracts/test/tutorials/arbitrage.ts +++ b/packages/contracts/test/tutorials/arbitrage.ts @@ -8,12 +8,12 @@ // import ethUtil = require('ethereumjs-util'); // import * as Web3 from 'web3'; -// import { AccountLevelsContract } from '../../src/contract_wrappers/generated/account_levels'; -// import { ArbitrageContract } from '../../src/contract_wrappers/generated/arbitrage'; -// import { DummyTokenContract } from '../../src/contract_wrappers/generated/dummy_token'; -// import { EtherDeltaContract } from '../../src/contract_wrappers/generated/ether_delta'; -// import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange'; -// import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy'; +// import { AccountLevelsContract } from '../../src/generated_contract_wrappers/account_levels'; +// import { ArbitrageContract } from '../../src/generated_contract_wrappers/arbitrage'; +// import { DummyTokenContract } from '../../src/generated_contract_wrappers/dummy_token'; +// import { EtherDeltaContract } from '../../src/generated_contract_wrappers/ether_delta'; +// import { ExchangeContract } from '../../src/generated_contract_wrappers/exchange'; +// import { TokenTransferProxyContract } from '../../src/generated_contract_wrappers/token_transfer_proxy'; // import { artifacts } from '../../util/artifacts'; // import { Balances } from '../../util/balances'; // import { constants } from '../../util/constants'; |