From d142413745cb08e0a2af58f1205dbca2eb499044 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 22 Nov 2018 15:55:21 +0100 Subject: Rename calldata to callData because solhint doesn't like calldata (probably reserved keyword) and goes nuts --- .../ReentrantERC20Token/ReentrantERC20Token.sol | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'contracts') diff --git a/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol b/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol index 99dd47a78..aa3bf9ab8 100644 --- a/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol +++ b/contracts/core/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol @@ -92,53 +92,53 @@ contract ReentrantERC20Token is LibOrder.Order[] memory orders; uint256[] memory takerAssetFillAmounts; bytes[] memory signatures; - bytes memory calldata; + bytes memory callData; - // Create calldata for function that corresponds to currentFunctionId + // Create callData for function that corresponds to currentFunctionId if (currentFunctionId == uint8(ExchangeFunction.FILL_ORDER)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.fillOrder.selector, order, 0, signature ); } else if (currentFunctionId == uint8(ExchangeFunction.FILL_OR_KILL_ORDER)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.fillOrKillOrder.selector, order, 0, signature ); } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.batchFillOrders.selector, orders, takerAssetFillAmounts, signatures ); } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_OR_KILL_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.batchFillOrKillOrders.selector, orders, takerAssetFillAmounts, signatures ); } else if (currentFunctionId == uint8(ExchangeFunction.MARKET_BUY_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.marketBuyOrders.selector, orders, 0, signatures ); } else if (currentFunctionId == uint8(ExchangeFunction.MARKET_SELL_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.marketSellOrders.selector, orders, 0, signatures ); } else if (currentFunctionId == uint8(ExchangeFunction.MATCH_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.matchOrders.selector, order, order, @@ -146,22 +146,22 @@ contract ReentrantERC20Token is signature ); } else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDER)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.cancelOrder.selector, order ); } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_CANCEL_ORDERS)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.batchCancelOrders.selector, orders ); } else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDERS_UP_TO)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.cancelOrdersUpTo.selector, 0 ); } else if (currentFunctionId == uint8(ExchangeFunction.SET_SIGNATURE_VALIDATOR_APPROVAL)) { - calldata = abi.encodeWithSelector( + callData = abi.encodeWithSelector( EXCHANGE.setSignatureValidatorApproval.selector, address(0), false @@ -169,7 +169,7 @@ contract ReentrantERC20Token is } // Call Exchange function, swallow error - address(EXCHANGE).call(calldata); + address(EXCHANGE).call(callData); // Revert reason is 100 bytes bytes memory returnData = new bytes(100); -- cgit v1.2.3