From 3cc26d167f1454e46dd8fc625d99d5ab5601ec8c Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Mon, 7 Nov 2016 11:37:32 +0100
Subject: [PATCH] chore(benchmarks): lint happy

---
 benchmarks/ephemeral-keys.js |  2 +-
 benchmarks/key-stretcher.js  | 54 +++++++++++++++++++-----------------
 benchmarks/rsa.js            |  2 +-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/benchmarks/ephemeral-keys.js b/benchmarks/ephemeral-keys.js
index ed463af..ade7677 100644
--- a/benchmarks/ephemeral-keys.js
+++ b/benchmarks/ephemeral-keys.js
@@ -33,5 +33,5 @@ suite
     console.log(String(event.target))
   })
   .run({
-    'async': true
+    async: true
   })
diff --git a/benchmarks/key-stretcher.js b/benchmarks/key-stretcher.js
index b4baa46..5b7f2a5 100644
--- a/benchmarks/key-stretcher.js
+++ b/benchmarks/key-stretcher.js
@@ -1,6 +1,8 @@
 'use strict'
 
 const Benchmark = require('benchmark')
+const async = require('async')
+
 const crypto = require('../src')
 
 const suite = new Benchmark.Suite('key-stretcher')
@@ -10,38 +12,38 @@ const keys = []
 const ciphers = ['AES-128', 'AES-256', 'Blowfish']
 const hashes = ['SHA1', 'SHA256', 'SHA512']
 
-crypto.generateEphemeralKeyPair('P-256', (err, res) => {
+async.waterfall([
+  (cb) => crypto.generateEphemeralKeyPair('P-256', cb),
+  (res, cb) => res.genSharedKey(res.key, cb)
+], (err, secret) => {
   if (err) {
     throw err
   }
 
-  res.genSharedKey(res.key, (err, secret) => {
-    if (err) {
-      throw err
-    }
-    ciphers.forEach((cipher) => {
-      hashes.forEach((hash) => {
-        suite.add(`keyStretcher ${cipher} ${hash}`, (d) => {
-          crypto.keyStretcher(cipher, hash, secret, (err, k) => {
-            if (err) {
-              throw err
-            }
+  ciphers.forEach((cipher) => hashes.forEach((hash) => {
+    setup(cipher, hash, secret)
+  }))
 
-            keys.push(k)
-            d.resolve()
-          })
-        }, {
-          defer: true
-        })
-      })
+  suite
+    .on('cycle', (event) => {
+      console.log(String(event.target))
+    })
+    .run({
+      async: true
     })
-  })
 })
 
-suite
-  .on('cycle', (event) => {
-    console.log(String(event.target))
-  })
-  .run({
-    'async': true
+function setup (cipher, hash, secret) {
+  suite.add(`keyStretcher ${cipher} ${hash}`, (d) => {
+    crypto.keyStretcher(cipher, hash, secret, (err, k) => {
+      if (err) {
+        throw err
+      }
+
+      keys.push(k)
+      d.resolve()
+    })
+  }, {
+    defer: true
   })
+}
diff --git a/benchmarks/rsa.js b/benchmarks/rsa.js
index 9561a65..8ad39e1 100644
--- a/benchmarks/rsa.js
+++ b/benchmarks/rsa.js
@@ -48,5 +48,5 @@ suite
     console.log(String(event.target))
   })
   .run({
-    'async': true
+    async: true
   })