Rewrite isValidSignature tests

package.json

@@ -55,7 +55,7 @@
     "bignumber.js": "^4.0.2",
     "chai": "^4.0.1",
     "chai-as-promised": "^6.0.0",
-    "chai-as-promised-typescript-typings": "0.0.2",
+    "chai-as-promised-typescript-typings": "0.0.3",
     "chai-bignumber": "git+ssh://git@github.com:0xProject/chai-bignumber.git",
     "chai-typescript-typings": "^0.0.0",
     "copyfiles": "^1.2.0",

test/0x.js_test.ts

@@ -6,8 +6,9 @@ import * as BigNumber from 'bignumber.js';
 import * as Sinon from 'sinon';
 import {ZeroEx} from '../src/0x.js';
 import {constants} from './utils/constants';
-import {web3Factory} from './utils/web3_factory';
 import {Order} from '../src/types';
+import {ECSignature} from '../src/types';
+import {web3Factory} from './utils/web3_factory';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -51,60 +52,33 @@ describe('ZeroEx library', () => {
             s: '0x2d887fd3b17bfdce3481f10bea41f45ba9f709d39ce8325427b57afcfc994cee',
         };
         const address = '0x9b2055d370f73ec7d8a03e965129118dc8f5bf83';
-        describe('should throw if passed a malformed signature', () => {
+        const web3 = web3Factory.create();
-            it('malformed v', () => {
+        const zeroEx = new ZeroEx(web3);
-                const malformedSignature = {
+        it('should return false if the data doesn\'t pertain to the signature & address', async () => {
-                    v: 34,
+            expect(ZeroEx.isValidSignature('0x0', signature, address)).to.be.false();
-                    r: signature.r,
+            return expect(
-                    s: signature.s,
+                (zeroEx.exchange as any).isValidSignatureUsingContractCallAsync('0x0', signature, address),
-                };
+            ).to.become(false);
-                expect(() => ZeroEx.isValidSignature(data, malformedSignature, address)).to.throw();
-            });
-            it('r lacks 0x prefix', () => {
-                const malformedR = signature.r.replace('0x', '');
-                const malformedSignature = {
-                    v: signature.v,
-                    r: malformedR,
-                    s: signature.s,
-                };
-                expect(() => ZeroEx.isValidSignature(data, malformedSignature, address)).to.throw();
-            });
-            it('r is too short', () => {
-                const malformedR = signature.r.substr(10);
-                const malformedSignature = {
-                    v: signature.v,
-                    r: malformedR,
-                    s: signature.s.replace('0', 'z'),
-                };
-                expect(() => ZeroEx.isValidSignature(data, malformedSignature, address)).to.throw();
-            });
-            it('s is not hex', () => {
-                const malformedS = signature.s.replace('0', 'z');
-                const malformedSignature = {
-                    v: signature.v,
-                    r: signature.r,
-                    s: malformedS,
-                };
-                expect(() => ZeroEx.isValidSignature(data, malformedSignature, address)).to.throw();
-            });
         });
-        it('should return false if the data doesn\'t pertain to the signature & address', () => {
+        it('should return false if the address doesn\'t pertain to the signature & data', async () => {
-            const isValid = ZeroEx.isValidSignature('0x0', signature, address);
-            expect(isValid).to.be.false();
-        });
-        it('should return false if the address doesn\'t pertain to the signature & data', () => {
             const validUnrelatedAddress = '0x8b0292B11a196601eD2ce54B665CaFEca0347D42';
-            const isValid = ZeroEx.isValidSignature(data, signature, validUnrelatedAddress);
+            expect(ZeroEx.isValidSignature(data, signature, validUnrelatedAddress)).to.be.false();
-            expect(isValid).to.be.false();
+            return expect(
+                (zeroEx.exchange as any).isValidSignatureUsingContractCallAsync(data, signature, validUnrelatedAddress)
+            ).to.become(false);
         });
-        it('should return false if the signature doesn\'t pertain to the data & address', () => {
+        it('should return false if the signature doesn\'t pertain to the data & address', async () => {
             const wrongSignature = _.assign({}, signature, {v: 28});
-            const isValid = ZeroEx.isValidSignature(data, wrongSignature, address);
+            expect(ZeroEx.isValidSignature(data, wrongSignature, address)).to.be.false();
-            expect(isValid).to.be.false();
+            return expect(
+                (zeroEx.exchange as any).isValidSignatureUsingContractCallAsync(data, wrongSignature, address)
+            ).to.become(false);
         });
-        it('should return true if the signature does pertain to the data & address', () => {
+        it('should return true if the signature does pertain to the data & address', async () => {
-            const isValid = ZeroEx.isValidSignature(data, signature, address);
+            expect(ZeroEx.isValidSignature(data, signature, address)).to.be.true();
-            expect(isValid).to.be.true();
+            return expect(
+                (zeroEx.exchange as any).isValidSignatureUsingContractCallAsync(data, signature, address)
+            ).to.become(true);
         });
     });
     describe('#generateSalt', () => {

yarn.lock

@@ -902,9 +902,9 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai-as-promised-typescript-typings@0.0.2:
+chai-as-promised-typescript-typings@0.0.3:
-  version "0.0.2"
+  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.2.tgz#5df99c418917a78eb314e5f83f306cb95ae846cb"
+  resolved "https://registry.yarnpkg.com/chai-as-promised-typescript-typings/-/chai-as-promised-typescript-typings-0.0.3.tgz#8694287ebe2dd6c18a96667c38151d714d6ecbb6"
   dependencies:
     chai-typescript-typings "^0.0.0"
 
@@ -1169,13 +1169,13 @@ debug-log@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@2.6.0, debug@^2.1.1, debug@^2.2.0:
+debug@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
-debug@^2.6.3:
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.3:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies: