aboutsummaryrefslogtreecommitdiffstats
path: root/src/0x.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-10-30 22:17:39 +0800
committerFabio Berger <me@fabioberger.com>2017-10-30 22:17:39 +0800
commitb49d1dae7debbb50c57dc4755447f2cffee35ccd (patch)
tree25397180b858b508312cc4a6c721b848cf1cd1d2 /src/0x.ts
parent9b0496b0491e9fbe353a4c29d8082cf56ede9e38 (diff)
parentfec8f8a881dde19132dcf0eea727ae9fbb25adb6 (diff)
downloaddexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.gz
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.bz2
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.lz
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.xz
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.zst
dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.zip
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js: Update CHANGELOG 0.22.4 Add HACK comments Add a forgotten augmentation file Upgrade bignumber to the version with native typings and remove typings Downgrade typedoc Upgrade bignumber to the version with native typings and remove typings
Diffstat (limited to 'src/0x.ts')
-rw-r--r--src/0x.ts8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/0x.ts b/src/0x.ts
index 9f955c807..bc753434c 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -1,5 +1,5 @@
import * as _ from 'lodash';
-import * as BigNumber from 'bignumber.js';
+import BigNumber from 'bignumber.js';
import {SchemaValidator, schemas} from '0x-json-schemas';
import {bigNumberConfigs} from './bignumber_config';
import * as ethUtil from 'ethereumjs-util';
@@ -100,7 +100,7 @@ export class ZeroEx {
* and will not collide with other outstanding orders that are identical in all other parameters.
* @return A pseudo-random 256-bit number that can be used as a salt.
*/
- public static generatePseudoRandomSalt(): BigNumber.BigNumber {
+ public static generatePseudoRandomSalt(): BigNumber {
// BigNumber.random returns a pseudo-random number between 0 & 1 with a passed in number of decimal places.
// Source: https://mikemcl.github.io/bignumber.js/#random
const randomNumber = BigNumber.random(constants.MAX_DIGITS_IN_UNSIGNED_256_INT);
@@ -131,7 +131,7 @@ export class ZeroEx {
* @param decimals The number of decimal places the unit amount has.
* @return The amount in units.
*/
- public static toUnitAmount(amount: BigNumber.BigNumber, decimals: number): BigNumber.BigNumber {
+ public static toUnitAmount(amount: BigNumber, decimals: number): BigNumber {
assert.isBigNumber('amount', amount);
assert.isNumber('decimals', decimals);
@@ -147,7 +147,7 @@ export class ZeroEx {
* @param decimals The number of decimal places the unit amount has.
* @return The amount in baseUnits.
*/
- public static toBaseUnitAmount(amount: BigNumber.BigNumber, decimals: number): BigNumber.BigNumber {
+ public static toBaseUnitAmount(amount: BigNumber, decimals: number): BigNumber {
assert.isBigNumber('amount', amount);
assert.isNumber('decimals', decimals);