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

Clear compiler warnings

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-07 22:20:47 -07:00
parent 10c62c10aa
commit 35bf179b70
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/exchange/contracts/src/MixinSignatureValidator.sol
View File

@ -422,7 +422,7 @@ contract MixinSignatureValidator is
returns (SignatureType signatureType) returns (SignatureType signatureType)
{ {
// Read the signatureType from the signature // Read the signatureType from the signature
SignatureType signatureType = _readSignatureType( signatureType = _readSignatureType(
hash, hash,
signerAddress, signerAddress,
signature signature

4
contracts/exchange/contracts/test/IsolatedExchange.sol
View File

@ -72,8 +72,8 @@ contract IsolatedExchange is
/// @dev Overridden to simplify signature validation. /// @dev Overridden to simplify signature validation.
/// Unfortunately, this is `view`, so it can't log arguments. /// Unfortunately, this is `view`, so it can't log arguments.
function _isValidOrderWithHashSignature( function _isValidOrderWithHashSignature(
LibOrder.Order memory order, LibOrder.Order memory,
bytes32 orderHash, bytes32,
bytes memory signature bytes memory signature
) )
internal internal

32
contracts/exchange/contracts/test/ReentrancyTester.sol
View File

@ -50,16 +50,16 @@ contract ReentrancyTester is
function isReentrant(bytes calldata fnCallData) function isReentrant(bytes calldata fnCallData)
external external
nonReentrant nonReentrant
returns (bool isReentrant) returns (bool allowsReentrancy)
{ {
(bool didSucceed, bytes memory resultData) = address(this).delegatecall(fnCallData); (bool didSucceed, bytes memory resultData) = address(this).delegatecall(fnCallData);
if (didSucceed) { if (didSucceed) {
isReentrant = true; allowsReentrancy = true;
} else { } else {
if (resultData.equals(LibReentrancyGuardRichErrors.IllegalReentrancyError())) { if (resultData.equals(LibReentrancyGuardRichErrors.IllegalReentrancyError())) {
isReentrant = false; allowsReentrancy = false;
} else { } else {
isReentrant = true; allowsReentrancy = true;
} }
} }
} }
@ -96,8 +96,8 @@ contract ReentrancyTester is
/// @dev Overridden to always succeed. /// @dev Overridden to always succeed.
function _fillOrder( function _fillOrder(
LibOrder.Order memory order, LibOrder.Order memory order,
uint256 takerAssetFillAmount, uint256,
bytes memory signature bytes memory
) )
internal internal
returns (LibFillResults.FillResults memory fillResults) returns (LibFillResults.FillResults memory fillResults)
@ -111,8 +111,8 @@ contract ReentrancyTester is
/// @dev Overridden to always succeed. /// @dev Overridden to always succeed.
function _fillOrKillOrder( function _fillOrKillOrder(
LibOrder.Order memory order, LibOrder.Order memory order,
uint256 takerAssetFillAmount, uint256,
bytes memory signature bytes memory
) )
internal internal
returns (LibFillResults.FillResults memory fillResults) returns (LibFillResults.FillResults memory fillResults)
@ -125,8 +125,8 @@ contract ReentrancyTester is
/// @dev Overridden to always succeed. /// @dev Overridden to always succeed.
function _executeTransaction( function _executeTransaction(
LibZeroExTransaction.ZeroExTransaction memory transaction, LibZeroExTransaction.ZeroExTransaction memory,
bytes memory signature bytes memory
) )
internal internal
returns (bytes memory resultData) returns (bytes memory resultData)
@ -139,9 +139,9 @@ contract ReentrancyTester is
function _batchMatchOrders( function _batchMatchOrders(
LibOrder.Order[] memory leftOrders, LibOrder.Order[] memory leftOrders,
LibOrder.Order[] memory rightOrders, LibOrder.Order[] memory rightOrders,
bytes[] memory leftSignatures, bytes[] memory,
bytes[] memory rightSignatures, bytes[] memory,
bool shouldMaximallyFillOrders bool
) )
internal internal
returns (LibFillResults.BatchMatchedFillResults memory batchMatchedFillResults) returns (LibFillResults.BatchMatchedFillResults memory batchMatchedFillResults)
@ -171,9 +171,9 @@ contract ReentrancyTester is
function _matchOrders( function _matchOrders(
LibOrder.Order memory leftOrder, LibOrder.Order memory leftOrder,
LibOrder.Order memory rightOrder, LibOrder.Order memory rightOrder,
bytes memory leftSignature, bytes memory,
bytes memory rightSignature, bytes memory,
bool shouldMaximallyFillOrders bool
) )
internal internal
returns (LibFillResults.MatchedFillResults memory matchedFillResults) returns (LibFillResults.MatchedFillResults memory matchedFillResults)

1
contracts/exchange/contracts/test/TestProtocolFeesReceiver.sol
View File

@ -253,6 +253,7 @@ contract TestProtocolFeesReceiver {
uint256 expectedProtocolFeePaid uint256 expectedProtocolFeePaid
) )
internal internal
pure
{ {
// If the expected available balance was sufficient to pay the protocol fee, the protocol fee // 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. // should have been paid in ether. Otherwise, no ether should be sent to pay the protocol fee.

1
contracts/utils/contracts/test/TestOwnable.sol
View File

@ -9,6 +9,7 @@ contract TestOwnable is
function externalOnlyOwner() function externalOnlyOwner()
external external
onlyOwner onlyOwner
view
returns (bool) returns (bool)
{ {
return true; return true;