address comments

0xProject · Dec 3, 2019 · 2232870 · 2232870
1 parent 1ca085e
commit 2232870
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/erc20-bridge-sampler/test/erc20-bridge-sampler.ts b/contracts/erc20-bridge-sampler/test/erc20-bridge-sampler.ts
@@ -198,7 +198,7 @@ blockchainTests('erc20-bridge-sampler', env => {
     }
 
     function getDeterministicOrderInfo(order: Order): OrderInfo {
-        const hash = getPackedHash(toHex(order.salt, 32));
+        const hash = getPackedHash(hexLeftPad(order.salt, 32));
         return {
             orderHash: hash,
             orderStatus: new BigNumber(hash).mod(255).toNumber(),

diff --git a/contracts/integrations/test/exchange/transaction_protocol_fee_test.ts b/contracts/integrations/test/exchange/transaction_protocol_fee_test.ts
@@ -410,7 +410,7 @@ blockchainTests.resets('Transaction <> protocol fee integration tests', env => {
                 const tx = deployment.exchange
                     .batchExecuteTransactions(transactions, signatures)
                     .awaitTransactionSuccessAsync({ from: alice.address, value: MIXED_FEES_WITH_REFUND });
-                expect(tx).to.revertWith(protocolFeeError(order, failTransaction));
+                return expect(tx).to.revertWith(protocolFeeError(order, failTransaction));
             });
         });
         describe('Nested', () => {

diff --git a/contracts/integrations/test/forwarder/forwarder_test_factory.ts b/contracts/integrations/test/forwarder/forwarder_test_factory.ts
@@ -272,14 +272,14 @@ export class ForwarderTestFactory {
         balances.wrapEth(this._forwarder.address, this._deployment.tokens.weth.address, wethSpentAmount);
         // (In reality this is done all at once, but we simulate it order by order)
 
-        // Maker -> Forwarder
-        balances.transferAsset(order.makerAddress, this._forwarder.address, makerAssetAmount, order.makerAssetData);
-        // Maker -> Order fee recipient
-        balances.transferAsset(order.makerAddress, order.feeRecipientAddress, makerFee, order.makerFeeAssetData);
         // Forwarder -> Maker
         balances.transferAsset(this._forwarder.address, order.makerAddress, takerAssetAmount, order.takerAssetData);
+        // Maker -> Forwarder
+        balances.transferAsset(order.makerAddress, this._forwarder.address, makerAssetAmount, order.makerAssetData);
         // Forwarder -> Order fee recipient
         balances.transferAsset(this._forwarder.address, order.feeRecipientAddress, takerFee, order.takerFeeAssetData);
+        // Maker -> Order fee recipient
+        balances.transferAsset(order.makerAddress, order.feeRecipientAddress, makerFee, order.makerFeeAssetData);
         // Forwarder pays the protocol fee in WETH
         balances.transferAsset(
             this._forwarder.address,