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

Remove unused LibOrder inheritance from MixinBalanceThresholdFilterCore from /contracts/extensions.

Browse Source
This commit is contained in:
Lawrence Forman 2019-03-22 16:14:12 -04:00 committed by Amir Bandeali
parent 74a9a13564
commit 92fe720ac3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/coordinator/contracts/src/libs/LibEIP712Domain.sol
View File

@ -53,7 +53,7 @@ contract LibEIP712Domain is
EIP712_EXCHANGE_DOMAIN_HASH = hashEIP712Domain( EIP712_EXCHANGE_DOMAIN_HASH = hashEIP712Domain(
EIP712_EXCHANGE_DOMAIN_NAME, EIP712_EXCHANGE_DOMAIN_NAME,
EIP712_EXCHANGE_DOMAIN_VERSION, EIP712_EXCHANGE_DOMAIN_VERSION,
address(this) address(EXCHANGE)
); );
} }

10
contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
View File

@ -19,7 +19,6 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "./mixins/MBalanceThresholdFilterCore.sol"; import "./mixins/MBalanceThresholdFilterCore.sol";
import "./MixinExchangeCalldata.sol"; import "./MixinExchangeCalldata.sol";
@ -27,12 +26,11 @@ import "./MixinExchangeCalldata.sol";
contract MixinBalanceThresholdFilterCore is contract MixinBalanceThresholdFilterCore is
MBalanceThresholdFilterCore, MBalanceThresholdFilterCore,
MixinExchangeCalldata, MixinExchangeCalldata,
LibOrder,
LibExchangeSelectors LibExchangeSelectors
{ {
/// @dev Executes an Exchange transaction iff the maker and taker meet /// @dev Executes an Exchange transaction iff the maker and taker meet
/// the hold at least `BALANCE_THRESHOLD` of the asset `THRESHOLD_ASSET` OR /// the hold at least `BALANCE_THRESHOLD` of the asset `THRESHOLD_ASSET` OR
/// the exchange function is a cancellation. /// the exchange function is a cancellation.
/// Supported Exchange functions: /// Supported Exchange functions:
/// batchFillOrders /// batchFillOrders
@ -59,7 +57,7 @@ contract MixinBalanceThresholdFilterCore is
address signerAddress, address signerAddress,
bytes calldata signedExchangeTransaction, bytes calldata signedExchangeTransaction,
bytes calldata signature bytes calldata signature
) )
external external
{ {
// Get accounts whose balances must be validated // Get accounts whose balances must be validated
@ -76,7 +74,7 @@ contract MixinBalanceThresholdFilterCore is
); );
} }
emit ValidatedAddresses(addressesToValidate); emit ValidatedAddresses(addressesToValidate);
// All addresses are valid. Execute exchange function. // All addresses are valid. Execute exchange function.
EXCHANGE.executeTransaction( EXCHANGE.executeTransaction(
salt, salt,