@0x:contracts-exchange Added protocol fees to fillOrders and matchOrders

2019-08-22 22:50:18 -07:00
parent 3a4e72bb08
commit 7f17033ce3
36 changed files with 346 additions and 721 deletions
--- a/contracts/exchange/test/transactions.ts
+++ b/contracts/exchange/test/transactions.ts
@@ -1037,13 +1037,14 @@ blockchainTests.resets('Exchange transactions', env => {
                    const cancelTransaction = await makerTransactionFactory.newSignedTransactionAsync({
                        data: cancelData,
                    });
+
                    await exchangeWrapperContract.cancelOrdersUpTo.awaitTransactionSuccessAsync(
                        targetOrderEpoch,
                        cancelTransaction.salt,
                        cancelTransaction.expirationTimeSeconds,
                        cancelTransaction.signature,
+                        // { from: makerAddress },
                        { from: makerAddress },
-                        constants.AWAIT_TRANSACTION_MINED_MS,
                    );

                    const takerAssetFillAmount = signedOrder.takerAssetAmount;