Remove unnecessary public functions
This commit is contained in:
@@ -35,8 +35,6 @@ contract Exchange is
|
||||
MixinWrapperFunctions,
|
||||
MixinTransferSimulator
|
||||
{
|
||||
string constant public VERSION = "3.0.0";
|
||||
|
||||
/// @dev Mixins are instantiated in the order they are inherited
|
||||
/// @param chainId Chain ID of the network this contract is deployed on.
|
||||
constructor (uint256 chainId)
|
||||
|
||||
@@ -369,7 +369,7 @@ contract MixinExchangeCore is
|
||||
// regular validation.
|
||||
address makerAddress = order.makerAddress;
|
||||
if (orderInfo.orderTakerAssetFilledAmount == 0 ||
|
||||
doesSignatureRequireRegularValidation(
|
||||
_doesSignatureRequireRegularValidation(
|
||||
orderInfo.orderHash,
|
||||
makerAddress,
|
||||
signature
|
||||
|
||||
@@ -177,12 +177,12 @@ contract MixinSignatureValidator is
|
||||
/// @param signature The signature for `hash`.
|
||||
/// @return needsRegularValidation True if the signature should be validated
|
||||
/// for every action.
|
||||
function doesSignatureRequireRegularValidation(
|
||||
function _doesSignatureRequireRegularValidation(
|
||||
bytes32 hash,
|
||||
address signerAddress,
|
||||
bytes memory signature
|
||||
)
|
||||
public
|
||||
internal
|
||||
pure
|
||||
returns (bool needsRegularValidation)
|
||||
{
|
||||
@@ -195,6 +195,7 @@ contract MixinSignatureValidator is
|
||||
signatureType == SignatureType.Wallet ||
|
||||
signatureType == SignatureType.Validator ||
|
||||
signatureType == SignatureType.EIP1271Wallet;
|
||||
return needsRegularValidation;
|
||||
}
|
||||
|
||||
/// @dev Verifies that an order, with provided order hash, has been signed
|
||||
|
||||
@@ -20,6 +20,7 @@ pragma solidity ^0.5.9;
|
||||
pragma experimental ABIEncoderV2;
|
||||
|
||||
import "./IExchangeCore.sol";
|
||||
import "./IProtocolFees.sol";
|
||||
import "./IMatchOrders.sol";
|
||||
import "./ISignatureValidator.sol";
|
||||
import "./ITransactions.sol";
|
||||
@@ -30,6 +31,7 @@ import "./ITransferSimulator.sol";
|
||||
|
||||
// solhint-disable no-empty-blocks
|
||||
contract IExchange is
|
||||
IProtocolFees,
|
||||
IExchangeCore,
|
||||
IMatchOrders,
|
||||
ISignatureValidator,
|
||||
|
||||
@@ -21,9 +21,6 @@ pragma solidity ^0.5.9;
|
||||
|
||||
contract IProtocolFees {
|
||||
|
||||
// The proxy id of the weth asset proxy.
|
||||
bytes internal constant WETH_ASSET_DATA = hex"f47261b0";
|
||||
|
||||
// Logs updates to the protocol fee multiplier.
|
||||
event ProtocolFeeMultiplier(uint256 oldProtocolFeeMultiplier, uint256 updatedProtocolFeeMultiplier);
|
||||
|
||||
|
||||
@@ -98,21 +98,6 @@ contract ISignatureValidator {
|
||||
view
|
||||
returns (bool isValid);
|
||||
|
||||
/// @dev Checks if a signature is of a type that should be verified for
|
||||
/// every subsequent fill.
|
||||
/// @param hash The hash of the order/transaction.
|
||||
/// @param signature The signature for `hash`.
|
||||
/// @return needsRegularValidation True if the signature should be validated
|
||||
/// for every operation.
|
||||
function doesSignatureRequireRegularValidation(
|
||||
bytes32 hash,
|
||||
address signerAddress,
|
||||
bytes memory signature
|
||||
)
|
||||
public
|
||||
pure
|
||||
returns (bool needsRegularValidation);
|
||||
|
||||
/// @dev Verifies that an order, with provided order hash, has been signed
|
||||
/// by the given signer.
|
||||
/// @param order The order.
|
||||
|
||||
Reference in New Issue
Block a user