Merge branch 'master' into addSchemas

# Conflicts:
#	package.json

1 files changed, 13 insertions, 0 deletions

diff --git a/test/0x.js.ts b/test/0x.js.ts
index 4d0b03a2a..2c4471e0f 100644
--- a/test/0x.js.ts
+++ b/test/0x.js.ts
@@ -1,6 +1,7 @@
 import {ZeroEx} from '../src/ts/0x.js';
 import {expect} from 'chai';
 import 'mocha';
+import * as BigNumber from 'bignumber.js';
 
 describe('ZeroEx library', () => {
     describe('#isValidSignature', () => {
@@ -89,4 +90,16 @@ describe('ZeroEx library', () => {
             expect(isValid).to.be.true;
         });
     });
+    describe('#generateSalt', () => {
+        it('generates different salts', () => {
+            const equal = ZeroEx.generatePseudoRandomSalt().eq(ZeroEx.generatePseudoRandomSalt());
+            expect(equal).to.be.false;
+        });
+        it('generates salt in range [0..2^256)', () => {
+            const salt = ZeroEx.generatePseudoRandomSalt();
+            expect(salt.greaterThanOrEqualTo(0)).to.be.true;
+            const twoPow256 = new BigNumber(2).pow(256);
+            expect(salt.lessThan(twoPow256)).to.be.true;
+        });
+    });
 });