Merge pull request #107 from ConsenSys/fix-bad-data

Fix sending bad data to API

Author: daniyarchambylov

index.js

@@ -67,7 +67,7 @@ class Client {
     *          database using getIssues().
     *
     **/
-  async analyze (options) {
+  async analyze (options, timeout, initialDelay) {
     if (options === undefined || options.data === undefined) {
       // eslint-disable-next-line no-throw-literal
       throw 'Please provide analysis request JSON in a "data" attribute.'
@@ -107,8 +107,7 @@ class Client {
          There is also average queuing delay as well which on average may be at
          least 5 seconds.
     */
-    let timeout = options.timeout
-    if (!('timeout' in options)) {
+    if (!timeout) {
       timeout = (60 * 1000) * (
         (options.data.analysisMode !== 'full')
           ? 5 // 5 minutes
@@ -129,7 +128,7 @@ class Client {
         console.log(`Cached Result:\n${util.inspect(result, { depth: depth })}\n------`)
       }
     } else {
-      const initialDelay = Math.max(options.initialDelay || 0, defaultInitialDelay)
+      initialDelay = Math.max(initialDelay || 0, defaultInitialDelay)
       try {
         result = await analysisPoller.do(requestResponse.uuid, this, timeout, initialDelay, options.debug)
       } catch (e) {
@@ -205,9 +204,9 @@ class Client {
     *      {Object} status - status information as returned in each object of analyses().
     *
     **/
-  async analyzeWithStatus (options) {
+  async analyzeWithStatus (options, timeout, initialDelay) {
     const start = Date.now()
-    const { issues, uuid } = await this.analyze(options, true)
+    const { issues, uuid } = await this.analyze(options, timeout, initialDelay)
     const status = await this.getStatus(uuid)
     const elapsed = Date.now() - start
     return {

test/index.js

@@ -109,7 +109,7 @@ describe('main module', () => {
                   .returns(1)
 
                 sinon.stub(this.instance, 'analyze')
-                  .withArgs(input, true)
+                  .withArgs(input)
                   .resolves({ issues: 'issues', uuid: 'uuid' })
 
                 sinon.stub(this.instance, 'getStatus')
@@ -304,7 +304,7 @@ describe('main module', () => {
                   resolve({ access: accessToken, refresh: refreshToken })
                 }))
               sinon.stub(requester, 'do')
-                .withArgs({ data, timeout }, accessToken, parsedApiUrl)
+                .withArgs({ data }, accessToken, parsedApiUrl)
                 .returns(new Promise(resolve => {
                   resolve({ uuid, status: 'Finished' })
                 }))
@@ -316,7 +316,7 @@ describe('main module', () => {
                 .returns(new Promise(resolve => {
                   resolve(issues)
                 }))
-              await this.instance.analyze({ data, timeout }).should.eventually.deep.equal({ issues, uuid })
+              await this.instance.analyze({ data }, timeout).should.eventually.deep.equal({ issues, uuid })
               poller.getIssues.restore()
             })
 
@@ -328,14 +328,14 @@ describe('main module', () => {
                   resolve({ access: accessToken, refresh: refreshToken })
                 }))
               sinon.stub(requester, 'do')
-                .withArgs({ data, timeout }, accessToken, parsedApiUrl)
+                .withArgs({ data }, accessToken, parsedApiUrl)
                 .returns(new Promise(resolve => {
                   resolve({ uuid })
                 }))
               sinon.stub(poller, 'do')
                 .withArgs(uuid, this.instance, timeout, armlet.defaultInitialDelay, undefined)
                 .resolves(issues)
-              await this.instance.analyze({ data, timeout }).should.eventually.deep.equal({ issues, uuid })
+              await this.instance.analyze({ data }, timeout).should.eventually.deep.equal({ issues, uuid })
             })
 
             it('should pass initial delay option to poller', async () => {
@@ -347,7 +347,7 @@ describe('main module', () => {
                   resolve({ access: accessToken, refresh: refreshToken })
                 }))
               sinon.stub(requester, 'do')
-                .withArgs({ data, timeout, initialDelay }, accessToken, parsedApiUrl)
+                .withArgs({ data }, accessToken, parsedApiUrl)
                 .returns(new Promise(resolve => {
                   resolve({ uuid })
                 }))
@@ -356,7 +356,7 @@ describe('main module', () => {
                 .returns(new Promise(resolve => {
                   resolve(issues)
                 }))
-              await this.instance.analyze({ data, timeout, initialDelay }).should.eventually.deep.equal({ issues, uuid })
+              await this.instance.analyze({ data }, timeout, initialDelay).should.eventually.deep.equal({ issues, uuid })
             })
           })