diff --git a/contracts/exchange/contracts/src/MixinSignatureValidator.sol b/contracts/exchange/contracts/src/MixinSignatureValidator.sol index 3503fb10b2..f961f1aedf 100644 --- a/contracts/exchange/contracts/src/MixinSignatureValidator.sol +++ b/contracts/exchange/contracts/src/MixinSignatureValidator.sol @@ -422,7 +422,7 @@ contract MixinSignatureValidator is returns (SignatureType signatureType) { // Read the signatureType from the signature - SignatureType signatureType = _readSignatureType( + signatureType = _readSignatureType( hash, signerAddress, signature diff --git a/contracts/exchange/contracts/test/IsolatedExchange.sol b/contracts/exchange/contracts/test/IsolatedExchange.sol index 098f61a078..fd54230559 100644 --- a/contracts/exchange/contracts/test/IsolatedExchange.sol +++ b/contracts/exchange/contracts/test/IsolatedExchange.sol @@ -72,8 +72,8 @@ contract IsolatedExchange is /// @dev Overridden to simplify signature validation. /// Unfortunately, this is `view`, so it can't log arguments. function _isValidOrderWithHashSignature( - LibOrder.Order memory order, - bytes32 orderHash, + LibOrder.Order memory, + bytes32, bytes memory signature ) internal diff --git a/contracts/exchange/contracts/test/ReentrancyTester.sol b/contracts/exchange/contracts/test/ReentrancyTester.sol index 897dbecd1b..85405e7807 100644 --- a/contracts/exchange/contracts/test/ReentrancyTester.sol +++ b/contracts/exchange/contracts/test/ReentrancyTester.sol @@ -50,16 +50,16 @@ contract ReentrancyTester is function isReentrant(bytes calldata fnCallData) external nonReentrant - returns (bool isReentrant) + returns (bool allowsReentrancy) { (bool didSucceed, bytes memory resultData) = address(this).delegatecall(fnCallData); if (didSucceed) { - isReentrant = true; + allowsReentrancy = true; } else { if (resultData.equals(LibReentrancyGuardRichErrors.IllegalReentrancyError())) { - isReentrant = false; + allowsReentrancy = false; } else { - isReentrant = true; + allowsReentrancy = true; } } } @@ -96,8 +96,8 @@ contract ReentrancyTester is /// @dev Overridden to always succeed. function _fillOrder( LibOrder.Order memory order, - uint256 takerAssetFillAmount, - bytes memory signature + uint256, + bytes memory ) internal returns (LibFillResults.FillResults memory fillResults) @@ -111,8 +111,8 @@ contract ReentrancyTester is /// @dev Overridden to always succeed. function _fillOrKillOrder( LibOrder.Order memory order, - uint256 takerAssetFillAmount, - bytes memory signature + uint256, + bytes memory ) internal returns (LibFillResults.FillResults memory fillResults) @@ -125,8 +125,8 @@ contract ReentrancyTester is /// @dev Overridden to always succeed. function _executeTransaction( - LibZeroExTransaction.ZeroExTransaction memory transaction, - bytes memory signature + LibZeroExTransaction.ZeroExTransaction memory, + bytes memory ) internal returns (bytes memory resultData) @@ -139,9 +139,9 @@ contract ReentrancyTester is function _batchMatchOrders( LibOrder.Order[] memory leftOrders, LibOrder.Order[] memory rightOrders, - bytes[] memory leftSignatures, - bytes[] memory rightSignatures, - bool shouldMaximallyFillOrders + bytes[] memory, + bytes[] memory, + bool ) internal returns (LibFillResults.BatchMatchedFillResults memory batchMatchedFillResults) @@ -171,9 +171,9 @@ contract ReentrancyTester is function _matchOrders( LibOrder.Order memory leftOrder, LibOrder.Order memory rightOrder, - bytes memory leftSignature, - bytes memory rightSignature, - bool shouldMaximallyFillOrders + bytes memory, + bytes memory, + bool ) internal returns (LibFillResults.MatchedFillResults memory matchedFillResults) diff --git a/contracts/exchange/contracts/test/TestProtocolFeesReceiver.sol b/contracts/exchange/contracts/test/TestProtocolFeesReceiver.sol index a908f4670f..7b205a39c7 100644 --- a/contracts/exchange/contracts/test/TestProtocolFeesReceiver.sol +++ b/contracts/exchange/contracts/test/TestProtocolFeesReceiver.sol @@ -253,6 +253,7 @@ contract TestProtocolFeesReceiver { uint256 expectedProtocolFeePaid ) internal + pure { // If the expected available balance was sufficient to pay the protocol fee, the protocol fee // should have been paid in ether. Otherwise, no ether should be sent to pay the protocol fee. diff --git a/contracts/utils/contracts/test/TestOwnable.sol b/contracts/utils/contracts/test/TestOwnable.sol index a62d3c713d..d7f4bc58b7 100644 --- a/contracts/utils/contracts/test/TestOwnable.sol +++ b/contracts/utils/contracts/test/TestOwnable.sol @@ -9,6 +9,7 @@ contract TestOwnable is function externalOnlyOwner() external onlyOwner + view returns (bool) { return true;