crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In @0x/contracts-exchange: Merge new transaction tests from rebase.

Browse Source
This commit is contained in:
Lawrence Forman 2019-04-30 11:32:57 -04:00 committed by Amir Bandeali
parent e5b3a82112
commit 46af2ffcea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/exchange/test/transactions.ts
View File

@ -860,8 +860,8 @@ describe('Exchange transactions', () => {
const transaction2 = takerTransactionFactory.newSignedTransaction(data2); const transaction2 = takerTransactionFactory.newSignedTransaction(data2);
const tx = exchangeWrapper.batchExecuteTransactionsAsync([transaction1, transaction2], senderAddress); const tx = exchangeWrapper.batchExecuteTransactionsAsync([transaction1, transaction2], senderAddress);
const nestedError = new ExchangeRevertErrors.OrderStatusError( const nestedError = new ExchangeRevertErrors.OrderStatusError(
OrderStatus.Cancelled,
orderHashUtils.getOrderHashHex(order), orderHashUtils.getOrderHashHex(order),
OrderStatus.Cancelled,
).encode(); ).encode();
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHashUtils.getTransactionHashHex(transaction2), transactionHashUtils.getTransactionHashHex(transaction2),
@ -913,7 +913,7 @@ describe('Exchange transactions', () => {
const transactionHashHex = transactionHashUtils.getTransactionHashHex(fillTransaction); const transactionHashHex = transactionHashUtils.getTransactionHashHex(fillTransaction);
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHashHex, transactionHashHex,
new ExchangeRevertErrors.OrderStatusError(OrderStatus.Cancelled, orderHashHex).encode(), new ExchangeRevertErrors.OrderStatusError(orderHashHex, OrderStatus.Cancelled).encode(),
); );
const tx = exchangeWrapperContract.fillOrder.sendTransactionAsync( const tx = exchangeWrapperContract.fillOrder.sendTransactionAsync(
signedOrder, signedOrder,