Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync

# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts

1 files changed, 2 insertions, 8 deletions

diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index 32040bd33..a548d8268 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -48,6 +48,7 @@ describe('ZeroEx library', () => {
         const expectedOrderHash = '0x103a5e97dab5dbeb8f385636f86a7d1e458a7ccbe1bd194727f0b2f85ab116c7';
         const order: Order = {
             maker: constants.NULL_ADDRESS,
+            taker: constants.NULL_ADDRESS,
             feeRecipient: constants.NULL_ADDRESS,
             makerTokenAddress: constants.NULL_ADDRESS,
             takerTokenAddress: constants.NULL_ADDRESS,
@@ -59,15 +60,8 @@ describe('ZeroEx library', () => {
             expirationUnixTimestampSec: new BigNumber(0),
         };
         const exchangeAddress = constants.NULL_ADDRESS;
-        it('defaults takerAddress to NULL address', () => {
-            const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, order);
-            expect(orderHash).to.be.equal(expectedOrderHash);
-        });
         it('calculates the order hash', () => {
-            const orderWithZeroTaker = _.assign(order, {
-                taker: constants.NULL_ADDRESS,
-            });
-            const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, orderWithZeroTaker);
+            const orderHash = ZeroEx.getOrderHashHex(exchangeAddress, order);
             expect(orderHash).to.be.equal(expectedOrderHash);
         });
     });