From 2cfb73e01971aab0ea89f81a71f703d05bd57073 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <courier@braydon.com>
Date: Fri, 1 Feb 2019 11:30:57 -0800
Subject: [PATCH] bench: update and fix api and dependencies

---
 bench/buffer.js   | 8 ++++----
 bench/chacha.js   | 2 +-
 bench/coins.js    | 4 ++--
 bench/merkle.js   | 3 ++-
 bench/tx.js       | 2 +-
 bench/walletdb.js | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/bench/buffer.js b/bench/buffer.js
index 847a0e94..4cb462f0 100644
--- a/bench/buffer.js
+++ b/bench/buffer.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const BufferWriter = require('../lib/utils/writer');
-const StaticWriter = require('../lib/utils/staticwriter');
+const BufferWriter = require('bufio').BufferWriter;
+const StaticWriter = require('bufio').StaticWriter;
 const common = require('../test/util/common');
 const bench = require('./bench');
 
@@ -14,7 +14,7 @@ const tx5 = common.readTX('tx5');
     tx.refresh();
     const {size} = tx.getWitnessSizes();
     const bw = new StaticWriter(size);
-    tx.toWitnessWriter(bw);
+    tx.toWriter(bw);
     bw.render();
   }
   end(10000);
@@ -26,7 +26,7 @@ const tx5 = common.readTX('tx5');
   for (let i = 0; i < 10000; i++) {
     tx.refresh();
     const bw = new BufferWriter();
-    tx.toWitnessWriter(bw);
+    tx.toWriter(bw);
     bw.render();
   }
   end(10000);
diff --git a/bench/chacha.js b/bench/chacha.js
index a1f3161c..02e38dac 100644
--- a/bench/chacha.js
+++ b/bench/chacha.js
@@ -42,7 +42,7 @@ poly.init(key);
   for (let i = 0; i < 1000000; i++) {
     poly.init(key);
     poly.update(data);
-    poly.finish();
+    poly.final();
   }
   end(1000000 * 32 / 1024);
 }
diff --git a/bench/coins.js b/bench/coins.js
index fea14577..a3ee6025 100644
--- a/bench/coins.js
+++ b/bench/coins.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const CoinView = require('../lib/coins/coinview');
-const BufferReader = require('../lib/utils/reader');
-const StaticWriter = require('../lib/utils/writer');
+const BufferReader = require('bufio').BufferReader;
+const StaticWriter = require('bufio').StaticWriter;
 const common = require('../test/util/common');
 const bench = require('./bench');
 
diff --git a/bench/merkle.js b/bench/merkle.js
index b182e02f..75cdc70c 100644
--- a/bench/merkle.js
+++ b/bench/merkle.js
@@ -3,6 +3,7 @@
 const assert = require('assert');
 const merkle = require('bcrypto/lib/merkle');
 const random = require('bcrypto/lib/random');
+const SHA256 = require('bcrypto/lib/sha256');
 const bench = require('./bench');
 
 const leaves = [];
@@ -13,7 +14,7 @@ for (let i = 0; i < 3000; i++)
 {
   const end = bench('tree');
   for (let i = 0; i < 1000; i++) {
-    const [n, m] = merkle.createTree(leaves.slice());
+    const [n, m] = merkle.createTree(SHA256, leaves.slice());
     assert(n);
     assert(!m);
   }
diff --git a/bench/tx.js b/bench/tx.js
index cd37affa..3b193340 100644
--- a/bench/tx.js
+++ b/bench/tx.js
@@ -156,7 +156,7 @@ const mtx = new MTX();
 for (let i = 0; i < 100; i++) {
   mtx.addInput({
     prevout: {
-      hash: consensus.NULL_HASH,
+      hash: consensus.ZERO_HASH,
       index: 0
     },
     script: new Script()
diff --git a/bench/walletdb.js b/bench/walletdb.js
index 23a92faa..74a0fb0f 100644
--- a/bench/walletdb.js
+++ b/bench/walletdb.js
@@ -37,7 +37,7 @@ const walletdb = new WalletDB({
     end(1000);
 
     for (const addr of result)
-      addrs.push(addr.receive.getAddress());
+      addrs.push(addr.receiveAddress());
   }
 
   // Keys