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

@0x/contracts-exchange: Fix failing tests.

Browse Source
This commit is contained in:
Lawrence Forman
2020-09-01 16:53:49 -04:00
parent 1d6aef5cd6
commit 79254de7bc
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,7 @@ describe('AssetProxyDispatcher', () => {
const expectedError = new ExchangeRevertErrors.AssetProxyTransferError( const expectedError = new ExchangeRevertErrors.AssetProxyTransferError(
orderHash, orderHash,
encodedAssetData, encodedAssetData,
nestedError.toString(), nestedError.encode(),
); );
const tx = assetProxyDispatcher const tx = assetProxyDispatcher
.dispatchTransferFrom(orderHash, encodedAssetData, makerAddress, takerAddress, amount) .dispatchTransferFrom(orderHash, encodedAssetData, makerAddress, takerAddress, amount)
@@ -313,7 +313,7 @@ describe('AssetProxyDispatcher', () => {
const expectedError = new ExchangeRevertErrors.AssetProxyTransferError( const expectedError = new ExchangeRevertErrors.AssetProxyTransferError(
transferIndexAsBytes32, transferIndexAsBytes32,
assetDataB, assetDataB,
nestedError.toString(), nestedError.encode(),
); );
const tx = assetProxyDispatcher const tx = assetProxyDispatcher
.simulateDispatchTransferFromCalls( .simulateDispatchTransferFromCalls(

10
contracts/exchange/test/signature_validator.ts
View File

@@ -300,7 +300,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
hashHex, hashHex,
validatorWallet.address, validatorWallet.address,
signatureHex, signatureHex,
new StringRevertError(validatorWalletRevertReason).toString(), new StringRevertError(validatorWalletRevertReason).encode(),
); );
const tx = validateAsync(hashHex, validatorWallet.address, signatureHex, ValidatorWalletAction.Revert); const tx = validateAsync(hashHex, validatorWallet.address, signatureHex, ValidatorWalletAction.Revert);
return expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
@@ -562,7 +562,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
validatorWallet.address, validatorWallet.address,
data, data,
signatureHex, signatureHex,
new StringRevertError(validatorWalletRevertReason).toString(), new StringRevertError(validatorWalletRevertReason).encode(),
); );
const tx = validateAsync(signedOrder, signatureHex, ValidatorWalletAction.Revert); const tx = validateAsync(signedOrder, signatureHex, ValidatorWalletAction.Revert);
return expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
@@ -693,7 +693,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
validatorWallet.address, validatorWallet.address,
data, data,
signatureHex, signatureHex,
new StringRevertError(validatorWalletRevertReason).toString(), new StringRevertError(validatorWalletRevertReason).encode(),
); );
const tx = validateAsync(signedOrder, signatureHex, ValidatorWalletAction.Revert); const tx = validateAsync(signedOrder, signatureHex, ValidatorWalletAction.Revert);
return expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
@@ -916,7 +916,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
validatorWallet.address, validatorWallet.address,
data, data,
signatureHex, signatureHex,
new StringRevertError(validatorWalletRevertReason).toString(), new StringRevertError(validatorWalletRevertReason).encode(),
); );
const tx = validateAsync(signedTransaction, signatureHex, ValidatorWalletAction.Revert); const tx = validateAsync(signedTransaction, signatureHex, ValidatorWalletAction.Revert);
return expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
@@ -1041,7 +1041,7 @@ blockchainTests.resets('MixinSignatureValidator', env => {
validatorWallet.address, validatorWallet.address,
data, data,
signatureHex, signatureHex,
new StringRevertError(validatorWalletRevertReason).toString(), new StringRevertError(validatorWalletRevertReason).encode(),
); );
const tx = validateAsync(signedTransaction, signatureHex, ValidatorWalletAction.Revert); const tx = validateAsync(signedTransaction, signatureHex, ValidatorWalletAction.Revert);
return expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);

16
contracts/exchange/test/transactions_unit_tests.ts
View File

@@ -101,7 +101,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const executableError = new StringRevertError('EXECUTABLE_FAILED'); const executableError = new StringRevertError('EXECUTABLE_FAILED');
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash, transactionHash,
executableError.toString(), executableError.encode(),
); );
// Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error. // Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error.
@@ -123,7 +123,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const executableError = new StringRevertError('EXECUTABLE_FAILED'); const executableError = new StringRevertError('EXECUTABLE_FAILED');
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash, transactionHash,
executableError.toString(), executableError.encode(),
); );
// Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error. // Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error.
@@ -145,7 +145,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const executableError = new StringRevertError('EXECUTABLE_FAILED'); const executableError = new StringRevertError('EXECUTABLE_FAILED');
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash, transactionHash,
executableError.toString(), executableError.encode(),
); );
// Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error. // Call the `batchExecuteTransactions()` function and ensure that it reverts with the expected revert error.
@@ -280,7 +280,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const outerExecuteTransactionHash = transactionHashUtils.getTransactionHashHex(outerExecuteTransaction); const outerExecuteTransactionHash = transactionHashUtils.getTransactionHashHex(outerExecuteTransaction);
const outerExpectedError = new ExchangeRevertErrors.TransactionExecutionError( const outerExpectedError = new ExchangeRevertErrors.TransactionExecutionError(
outerExecuteTransactionHash, outerExecuteTransactionHash,
innerExpectedError.toString(), innerExpectedError.encode(),
); );
const tx = transactionsContract const tx = transactionsContract
.batchExecuteTransactions([outerExecuteTransaction], [randomSignature()]) .batchExecuteTransactions([outerExecuteTransaction], [randomSignature()])
@@ -363,7 +363,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const errorData = new ExchangeRevertErrors.TransactionInvalidContextError( const errorData = new ExchangeRevertErrors.TransactionInvalidContextError(
innerTransactionHash, innerTransactionHash,
accounts[0], accounts[0],
).toString(); ).encode();
const expectedError = new ExchangeRevertErrors.TransactionExecutionError(outerTransactionHash, errorData); const expectedError = new ExchangeRevertErrors.TransactionExecutionError(outerTransactionHash, errorData);
const tx = transactionsContract const tx = transactionsContract
.executeTransaction(outerTransaction, validSignature) .executeTransaction(outerTransaction, validSignature)
@@ -385,7 +385,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const errorData = new ExchangeRevertErrors.TransactionInvalidContextError( const errorData = new ExchangeRevertErrors.TransactionInvalidContextError(
innerTransactionHash, innerTransactionHash,
accounts[0], accounts[0],
).toString(); ).encode();
const expectedError = new ExchangeRevertErrors.TransactionExecutionError(outerTransactionHash, errorData); const expectedError = new ExchangeRevertErrors.TransactionExecutionError(outerTransactionHash, errorData);
const tx = transactionsContract const tx = transactionsContract
.executeTransaction(outerTransaction, validSignature) .executeTransaction(outerTransaction, validSignature)
@@ -466,7 +466,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const executableError = new StringRevertError('EXECUTABLE_FAILED'); const executableError = new StringRevertError('EXECUTABLE_FAILED');
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash, transactionHash,
executableError.toString(), executableError.encode(),
); );
const tx = transactionsContract const tx = transactionsContract
.executeTransaction(transaction, randomSignature()) .executeTransaction(transaction, randomSignature())
@@ -486,7 +486,7 @@ blockchainTests.resets('Transaction Unit Tests', ({ provider, web3Wrapper, txDef
const executableError = new StringRevertError('EXECUTABLE_FAILED'); const executableError = new StringRevertError('EXECUTABLE_FAILED');
const expectedError = new ExchangeRevertErrors.TransactionExecutionError( const expectedError = new ExchangeRevertErrors.TransactionExecutionError(
transactionHash, transactionHash,
executableError.toString(), executableError.encode(),
); );
const tx = transactionsContract const tx = transactionsContract
.executeTransaction(transaction, validSignature) .executeTransaction(transaction, validSignature)