diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-08-31 04:07:51 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 04:07:51 +0800 |
commit | 81ba2a8411abc84ab052a65e1c674af44b8cf746 (patch) | |
tree | d113855536c875160d79434eb6967cd61d72e468 /packages/contracts/src/2.0.0/test | |
parent | a6e8b28da56c94cb7548ca29ed478dc803237efc (diff) | |
parent | 09b4d5e0e4a7100ab591a8711c10a173fb6ea16c (diff) | |
download | dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar.gz dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar.bz2 dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar.lz dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar.xz dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.tar.zst dexon-sol-tools-81ba2a8411abc84ab052a65e1c674af44b8cf746.zip |
Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternal
Add cancelOrderInternal, use within batchCancelOrders
Diffstat (limited to 'packages/contracts/src/2.0.0/test')
-rw-r--r-- | packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol b/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol index 4f4e28302..e3311c703 100644 --- a/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol +++ b/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol @@ -51,6 +51,7 @@ contract ReentrantERC20Token is MARKET_SELL_ORDERS, MATCH_ORDERS, CANCEL_ORDER, + BATCH_CANCEL_ORDERS, CANCEL_ORDERS_UP_TO, SET_SIGNATURE_VALIDATOR_APPROVAL } @@ -150,6 +151,11 @@ contract ReentrantERC20Token is EXCHANGE.cancelOrder.selector, order ); + } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_CANCEL_ORDERS)) { + calldata = abi.encodeWithSelector( + EXCHANGE.batchCancelOrders.selector, + orders + ); } else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDERS_UP_TO)) { calldata = abi.encodeWithSelector( EXCHANGE.cancelOrdersUpTo.selector, |