diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-06-08 23:21:00 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 23:21:00 +0800 |
commit | ce3aed7236b718c31a3b7eeaedcdc707490be5c8 (patch) | |
tree | c294517202166c86ed8568bd412e0239ca540163 /src | |
parent | d7b5212b73457fec1bb49155936d777305eb362b (diff) | |
parent | 0b5abb29a9ab8f2fda5bc37980c3e40296cf7696 (diff) | |
download | dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar.gz dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar.bz2 dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar.lz dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar.xz dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.tar.zst dexon-0x-contracts-ce3aed7236b718c31a3b7eeaedcdc707490be5c8.zip |
Merge pull request #48 from 0xProject/interfaceTweaks
Interface tweaks
Diffstat (limited to 'src')
-rw-r--r-- | src/0x.js.ts | 16 | ||||
-rw-r--r-- | src/contract_wrappers/contract_wrapper.ts | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts index 8f1178b2a..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); @@ -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; } @@ -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> { 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; } |