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

Fix build errors in exchange package contracts

Browse Source
This commit is contained in:
Amir Bandeali
2019-08-11 14:03:03 -07:00
parent 245956c658
commit 31c2b36039
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,7 @@ contract MixinExchangeCore is
_assertValidCancel(order, orderInfo);
// Noop if order is already unfillable
if (orderInfo.orderStatus != uint8(OrderStatus.FILLABLE)) {
if (orderInfo.orderStatus != uint8(LibOrder.OrderStatus.FILLABLE)) {
return;
}

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

@@ -19,6 +19,7 @@
pragma solidity ^0.5.5;
pragma experimental ABIEncoderV2;
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "../src/Exchange.sol";
@@ -71,7 +72,7 @@ contract IsolatedExchange is
/// @dev Overriden to simplify signature validation.
/// Unfortunately, this is `view`, so it can't log arguments.
function _isValidOrderWithHashSignature(
Order memory order,
LibOrder.Order memory order,
bytes32 orderHash,
bytes memory signature
)

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

@@ -44,7 +44,7 @@ contract TestExchangeInternals is
/// @dev Call `_updateFilledState()` but first set `filled[order]` to
/// `orderTakerAssetFilledAmount`.
function testUpdateFilledState(
Order memory order,
LibOrder.Order memory order,
address takerAddress,
bytes32 orderHash,
uint256 orderTakerAssetFilledAmount,
@@ -52,7 +52,7 @@ contract TestExchangeInternals is
)
public
{
filled[getOrderHash(order)] = orderTakerAssetFilledAmount;
filled[LibOrder.getOrderHash(order, EIP712_EXCHANGE_DOMAIN_HASH)] = orderTakerAssetFilledAmount;
_updateFilledState(
order,
takerAddress,