From a3140c86416fde624e92db745c70ebc72d443a00 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 8 Jun 2017 11:45:35 +0200
Subject: rename decimals to numDecimals for clarity

---
 src/0x.js.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 8f1178b2a..d06069294 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -83,11 +83,11 @@ export class ZeroEx {
      * E.g: If a currency has 18 decimal places, 1e18 or one quintillion of the currency is equivalent
      * to 1 unit.
      */
-    public static toUnitAmount(amount: BigNumber.BigNumber, decimals: number): BigNumber.BigNumber {
+    public static toUnitAmount(amount: BigNumber.BigNumber, numDecimals: number): BigNumber.BigNumber {
         assert.isBigNumber('amount', amount);
-        assert.isNumber('decimals', decimals);
+        assert.isNumber('numDecimals', numDecimals);
 
-        const aUnit = new BigNumber(10).pow(decimals);
+        const aUnit = new BigNumber(10).pow(numDecimals);
         const unit = amount.div(aUnit);
         return unit;
     }
@@ -96,11 +96,11 @@ export class ZeroEx {
      * is the amount expressed in the smallest denomination.
      * E.g: 1 unit of a token with 18 decimal places is expressed in baseUnits as 1000000000000000000
      */
-    public static toBaseUnitAmount(amount: BigNumber.BigNumber, decimals: number): BigNumber.BigNumber {
+    public static toBaseUnitAmount(amount: BigNumber.BigNumber, numDecimals: number): BigNumber.BigNumber {
         assert.isBigNumber('amount', amount);
-        assert.isNumber('decimals', decimals);
+        assert.isNumber('numDecimals', numDecimals);
 
-        const unit = new BigNumber(10).pow(decimals);
+        const unit = new BigNumber(10).pow(numDecimals);
         const baseUnitAmount = amount.times(unit);
         return baseUnitAmount;
     }
-- 
cgit v1.2.3


From 00782d6d68c08f3aec4f3dc8f8aee6054ac022e3 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 8 Jun 2017 12:05:48 +0200
Subject: Fix comments

---
 src/0x.js.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/0x.js.ts b/src/0x.js.ts
index d06069294..2bf8cad5e 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -33,7 +33,7 @@ export class ZeroEx {
     private web3Wrapper: Web3Wrapper;
     /**
      * Verifies that the elliptic curve signature `signature` was generated
-     * by signing `data` with the private key corresponding to the `signerAddressHex` address.
+     * by signing `dataHex` with the private key corresponding to the `signerAddressHex` address.
      */
     public static isValidSignature(dataHex: string, signature: ECSignature, signerAddressHex: string): boolean {
         assert.isHexString('dataHex', dataHex);
@@ -138,7 +138,7 @@ export class ZeroEx {
         return orderHashHex;
     }
     /**
-     * Signs an orderHash and returns it's elliptic curve signature
+     * Signs an orderHash and returns it's elliptic curve signature.
      * This method currently supports TestRPC, Geth and Parity above and below V1.6.6
      */
     public async signOrderHashAsync(orderHashHex: string, signerAddress: string): Promise<ECSignature> {
-- 
cgit v1.2.3


From 196130ff96cd20bd13c7bada0ba5eb8d62a2cdc5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 8 Jun 2017 12:06:04 +0200
Subject: Make web3Wrapper protected instead of public

---
 src/contract_wrappers/contract_wrapper.ts | 2 +-
 test/0x.js_test.ts                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts
index 9f4cd8039..c3067f613 100644
--- a/src/contract_wrappers/contract_wrapper.ts
+++ b/src/contract_wrappers/contract_wrapper.ts
@@ -5,7 +5,7 @@ import {ZeroExError} from '../types';
 import {utils} from '../utils/utils';
 
 export class ContractWrapper {
-    public web3Wrapper: Web3Wrapper;
+    protected web3Wrapper: Web3Wrapper;
     constructor(web3Wrapper: Web3Wrapper) {
         this.web3Wrapper = web3Wrapper;
     }
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index 58f259a11..9cba93488 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -35,9 +35,9 @@ describe('ZeroEx library', () => {
             // Check that all nested web3 instances return the updated provider
             const nestedWeb3WrapperProvider = (zeroEx as any).web3Wrapper.getCurrentProvider();
             expect((nestedWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
-            const exchangeWeb3WrapperProvider = zeroEx.exchange.web3Wrapper.getCurrentProvider();
+            const exchangeWeb3WrapperProvider = (zeroEx.exchange as any).web3Wrapper.getCurrentProvider();
             expect((exchangeWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
-            const tokenRegistryWeb3WrapperProvider = zeroEx.tokenRegistry.web3Wrapper.getCurrentProvider();
+            const tokenRegistryWeb3WrapperProvider = (zeroEx.tokenRegistry as any).web3Wrapper.getCurrentProvider();
             expect((tokenRegistryWeb3WrapperProvider as any).zeroExTestId).to.be.a('number');
         });
     });
-- 
cgit v1.2.3