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

Fix build

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-01 19:14:16 -07:00
parent 02a1e17f50
commit 18b65a61ff
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/dev-utils/contracts/src/LibTransactionDecoder.sol
View File

@ -48,8 +48,6 @@ contract LibTransactionDecoder {
if (functionSelector == IExchange(address(0)).batchCancelOrders.selector) { if (functionSelector == IExchange(address(0)).batchCancelOrders.selector) {
functionName = "batchCancelOrders"; functionName = "batchCancelOrders";
} else if (functionSelector == IExchange(address(0)).batchFillOrders.selector) {
functionName = "batchFillOrders";
} else if (functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector) { } else if (functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector) {
functionName = "batchFillOrdersNoThrow"; functionName = "batchFillOrdersNoThrow";
} else if (functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector) { } else if (functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector) {
@ -58,8 +56,6 @@ contract LibTransactionDecoder {
functionName = "cancelOrder"; functionName = "cancelOrder";
} else if (functionSelector == IExchange(address(0)).fillOrder.selector) { } else if (functionSelector == IExchange(address(0)).fillOrder.selector) {
functionName = "fillOrder"; functionName = "fillOrder";
} else if (functionSelector == IExchange(address(0)).fillOrderNoThrow.selector) {
functionName = "fillOrderNoThrow";
} else if (functionSelector == IExchange(address(0)).fillOrKillOrder.selector) { } else if (functionSelector == IExchange(address(0)).fillOrKillOrder.selector) {
functionName = "fillOrKillOrder"; functionName = "fillOrKillOrder";
} else if (functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector) { } else if (functionSelector == IExchange(address(0)).marketBuyOrdersNoThrow.selector) {
@ -88,8 +84,7 @@ contract LibTransactionDecoder {
signatures = new bytes[](0); signatures = new bytes[](0);
} else if ( } else if (
functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector || functionSelector == IExchange(address(0)).batchFillOrKillOrders.selector ||
functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector || functionSelector == IExchange(address(0)).batchFillOrdersNoThrow.selector
functionSelector == IExchange(address(0)).batchFillOrders.selector
) { ) {
(orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForBatchFill(transactionData); (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForBatchFill(transactionData);
} else if (functionSelector == IExchange(address(0)).cancelOrder.selector) { } else if (functionSelector == IExchange(address(0)).cancelOrder.selector) {
@ -99,8 +94,7 @@ contract LibTransactionDecoder {
signatures = new bytes[](0); signatures = new bytes[](0);
} else if ( } else if (
functionSelector == IExchange(address(0)).fillOrKillOrder.selector || functionSelector == IExchange(address(0)).fillOrKillOrder.selector ||
functionSelector == IExchange(address(0)).fillOrder.selector || functionSelector == IExchange(address(0)).fillOrder.selector
functionSelector == IExchange(address(0)).fillOrderNoThrow.selector
) { ) {
(orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForSingleOrderFill(transactionData); (orders, takerAssetFillAmounts, signatures) = _makeReturnValuesForSingleOrderFill(transactionData);
} else if ( } else if (

12
contracts/exchange-forwarder/test/utils/forwarder_test_factory.ts
View File

@ -164,7 +164,7 @@ export class ForwarderTestFactory {
this._forwarderFeeRecipientAddress, this._forwarderFeeRecipientAddress,
); );
const ordersInfoBefore = await this._exchangeWrapper.getOrdersInfoAsync(orders); const ordersInfoBefore = await Promise.all(orders.map(order => this._exchangeWrapper.getOrderInfoAsync(order)));
const orderStatusesBefore = ordersInfoBefore.map(orderInfo => orderInfo.orderStatus); const orderStatusesBefore = ordersInfoBefore.map(orderInfo => orderInfo.orderStatus);
const expectedResults = computeExpectedResults(orders, ordersInfoBefore, fractionalNumberOfOrdersToFill); const expectedResults = computeExpectedResults(orders, ordersInfoBefore, fractionalNumberOfOrdersToFill);
@ -197,7 +197,9 @@ export class ForwarderTestFactory {
await expect(tx).to.revertWith(options.revertError); await expect(tx).to.revertWith(options.revertError);
} else { } else {
const gasUsed = (await tx).gasUsed; const gasUsed = (await tx).gasUsed;
const ordersInfoAfter = await this._exchangeWrapper.getOrdersInfoAsync(orders); const ordersInfoAfter = await Promise.all(
orders.map(order => this._exchangeWrapper.getOrderInfoAsync(order)),
);
const orderStatusesAfter = ordersInfoAfter.map(orderInfo => orderInfo.orderStatus); const orderStatusesAfter = ordersInfoAfter.map(orderInfo => orderInfo.orderStatus);
await this._checkResultsAsync( await this._checkResultsAsync(
@ -235,7 +237,7 @@ export class ForwarderTestFactory {
this._forwarderFeeRecipientAddress, this._forwarderFeeRecipientAddress,
); );
const ordersInfoBefore = await this._exchangeWrapper.getOrdersInfoAsync(orders); const ordersInfoBefore = await Promise.all(orders.map(order => this._exchangeWrapper.getOrderInfoAsync(order)));
const orderStatusesBefore = ordersInfoBefore.map(orderInfo => orderInfo.orderStatus); const orderStatusesBefore = ordersInfoBefore.map(orderInfo => orderInfo.orderStatus);
const expectedResults = computeExpectedResults(orders, ordersInfoBefore, fractionalNumberOfOrdersToFill); const expectedResults = computeExpectedResults(orders, ordersInfoBefore, fractionalNumberOfOrdersToFill);
@ -266,7 +268,9 @@ export class ForwarderTestFactory {
await expect(tx).to.revertWith(options.revertError); await expect(tx).to.revertWith(options.revertError);
} else { } else {
const gasUsed = (await tx).gasUsed; const gasUsed = (await tx).gasUsed;
const ordersInfoAfter = await this._exchangeWrapper.getOrdersInfoAsync(orders); const ordersInfoAfter = await Promise.all(
orders.map(order => this._exchangeWrapper.getOrderInfoAsync(order)),
);
const orderStatusesAfter = ordersInfoAfter.map(orderInfo => orderInfo.orderStatus); const orderStatusesAfter = ordersInfoAfter.map(orderInfo => orderInfo.orderStatus);
await this._checkResultsAsync( await this._checkResultsAsync(

12
contracts/exchange/test/utils/constants.ts
View File

@ -12,16 +12,8 @@ export const constants = {
ExchangeFunctionName.SetProtocolFeeMultiplier, ExchangeFunctionName.SetProtocolFeeMultiplier,
ExchangeFunctionName.SetProtocolFeeCollectorAddress, ExchangeFunctionName.SetProtocolFeeCollectorAddress,
], ],
SINGLE_FILL_FN_NAMES: [ SINGLE_FILL_FN_NAMES: [ExchangeFunctionName.FillOrder, ExchangeFunctionName.FillOrKillOrder],
ExchangeFunctionName.FillOrder, BATCH_FILL_FN_NAMES: [ExchangeFunctionName.BatchFillOrKillOrders, ExchangeFunctionName.BatchFillOrdersNoThrow],
ExchangeFunctionName.FillOrKillOrder,
ExchangeFunctionName.FillOrderNoThrow,
],
BATCH_FILL_FN_NAMES: [
ExchangeFunctionName.BatchFillOrders,
ExchangeFunctionName.BatchFillOrKillOrders,
ExchangeFunctionName.BatchFillOrdersNoThrow,
],
MARKET_FILL_FN_NAMES: [ MARKET_FILL_FN_NAMES: [
ExchangeFunctionName.MarketBuyOrdersFillOrKill, ExchangeFunctionName.MarketBuyOrdersFillOrKill,
ExchangeFunctionName.MarketSellOrdersFillOrKill, ExchangeFunctionName.MarketSellOrdersFillOrKill,