From 2005054ec840d66248182fc4bc24518c73060af7 Mon Sep 17 00:00:00 2001 From: Michael Zhu Date: Tue, 11 Jan 2022 11:59:17 -0800 Subject: [PATCH] Remove revertIfIncomplete from batchMatch --- .../zero-ex/contracts/src/features/ERC721OrdersFeature.sol | 6 +----- .../src/features/interfaces/IERC721OrdersFeature.sol | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol index 382258d5a8..9362ec8854 100644 --- a/contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol +++ b/contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol @@ -481,7 +481,6 @@ contract ERC721OrdersFeature is /// @param buyOrders Orders buying ERC721 assets. /// @param sellOrderSignatures Signatures for the sell orders. /// @param buyOrderSignatures Signatures for the buy orders. - /// @param revertIfIncomplete Revert if any match operation fails. /// @return profits The amount of profit earned by the caller /// of this function for each pair of matched orders /// (denominated in the ERC20 token of the order pair). @@ -491,8 +490,7 @@ contract ERC721OrdersFeature is LibERC721Order.ERC721Order[] memory sellOrders, LibERC721Order.ERC721Order[] memory buyOrders, LibSignature.Signature[] memory sellOrderSignatures, - LibSignature.Signature[] memory buyOrderSignatures, - bool revertIfIncomplete + LibSignature.Signature[] memory buyOrderSignatures ) public override @@ -524,8 +522,6 @@ contract ERC721OrdersFeature is // If the matching succeeded, record the profit. (uint256 profit) = abi.decode(returnData, (uint256)); profits[i] = profit; - } else if (revertIfIncomplete) { - returnData.rrevert(); } } } diff --git a/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol b/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol index 79a3669dfe..b3d24acd4d 100644 --- a/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol +++ b/contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol @@ -179,7 +179,6 @@ interface IERC721OrdersFeature { /// @param buyOrders Orders buying ERC721 assets. /// @param sellOrderSignatures Signatures for the sell orders. /// @param buyOrderSignatures Signatures for the buy orders. - /// @param revertIfIncomplete Revert if any match operation fails. /// @return profits The amount of profit earned by the caller /// of this function for each pair of matched orders /// (denominated in the ERC20 token of the order pair). @@ -189,8 +188,7 @@ interface IERC721OrdersFeature { LibERC721Order.ERC721Order[] calldata sellOrders, LibERC721Order.ERC721Order[] calldata buyOrders, LibSignature.Signature[] calldata sellOrderSignatures, - LibSignature.Signature[] calldata buyOrderSignatures, - bool revertIfIncomplete + LibSignature.Signature[] calldata buyOrderSignatures ) external returns (uint256[] memory profits, bool[] memory successes);