From 828737f3bc47f8b5497aba4d93fddca87a83804f Mon Sep 17 00:00:00 2001
From: Nicholas Dudfield <ndudfield@gmail.com>
Date: Tue, 4 Aug 2015 13:54:26 +0700
Subject: [PATCH] Extract Sha512 to own file

---
 packages/ripple-keypairs/src/sha512.js        | 27 ++++++++++
 packages/ripple-keypairs/src/utils.js         | 54 +++++--------------
 .../ripple-keypairs/test/keypairs-test.js     |  2 +-
 3 files changed, 41 insertions(+), 42 deletions(-)
 create mode 100644 packages/ripple-keypairs/src/sha512.js

diff --git a/packages/ripple-keypairs/src/sha512.js b/packages/ripple-keypairs/src/sha512.js
new file mode 100644
index 00000000..5c47a557
--- /dev/null
+++ b/packages/ripple-keypairs/src/sha512.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const hashjs = require('hash.js');
+const BigNum = require('bn.js');
+
+module.exports = class Sha512 {
+  constructor() {
+    this.hash = hashjs.sha512();
+  }
+  add(bytes) {
+    this.hash.update(bytes);
+    return this;
+  }
+  addU32(i) {
+    return this.add([(i >>> 24) & 0xFF, (i >>> 16) & 0xFF,
+                     (i >>> 8) & 0xFF, i & 0xFF]);
+  }
+  finish() {
+    return this.hash.digest();
+  }
+  first256() {
+    return this.finish().slice(0, 32);
+  }
+  first256BN() {
+    return new BigNum(this.first256());
+  }
+};
diff --git a/packages/ripple-keypairs/src/utils.js b/packages/ripple-keypairs/src/utils.js
index ae188b94..6a2ffea1 100644
--- a/packages/ripple-keypairs/src/utils.js
+++ b/packages/ripple-keypairs/src/utils.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const BigNum = require('bn.js');
 const hashjs = require('hash.js');
+const Sha512 = require('./sha512');
 
 function isVirtual() {
   throw new Error('virtual method not implemented ');
@@ -19,13 +19,6 @@ function cachedProperty(obj, computer) {
   };
 }
 
-function arrayToHex(a) {
-  return a.map(function(byteValue) {
-    const hex = byteValue.toString(16).toUpperCase();
-    return hex.length > 1 ? hex : '0' + hex;
-  }).join('');
-}
-
 function toGenericArray(sequence) {
   const generic = [];
   for (let i = 0; i < sequence.length; i++) {
@@ -34,35 +27,11 @@ function toGenericArray(sequence) {
   return generic;
 }
 
-function bytesToHex(bytes) {
-  return arrayToHex(bytes);
-}
-
-class Sha512 {
-  constructor() {
-    this.hash = hashjs.sha512();
-  }
-  add(bytes) {
-    this.hash.update(bytes);
-    return this;
-  }
-  addU32(i) {
-    return this.add([(i >>> 24) & 0xFF, (i >>> 16) & 0xFF,
-                     (i >>> 8) & 0xFF, i & 0xFF]);
-  }
-  finish() {
-    return this.hash.digest();
-  }
-  first256() {
-    return this.finish().slice(0, 32);
-  }
-  first256BN() {
-    return new BigNum(this.first256());
-  }
-}
-
-function seedFromPhrase(phrase) {
-  return hashjs.sha512().update(phrase).digest().slice(0, 16);
+function bytesToHex(a) {
+  return a.map(function(byteValue) {
+    const hex = byteValue.toString(16).toUpperCase();
+    return hex.length > 1 ? hex : '0' + hex;
+  }).join('');
 }
 
 function createAccountID(pubKeyBytes) {
@@ -71,13 +40,16 @@ function createAccountID(pubKeyBytes) {
   return hash160;
 }
 
+function seedFromPhrase(phrase) {
+  return hashjs.sha512().update(phrase).digest().slice(0, 16);
+}
+
 module.exports = {
-  arrayToHex,
   bytesToHex,
   cachedProperty,
+  createAccountID,
   isVirtual,
-  Sha512,
-  toGenericArray,
   seedFromPhrase,
-  createAccountID
+  Sha512,
+  toGenericArray
 };
diff --git a/packages/ripple-keypairs/test/keypairs-test.js b/packages/ripple-keypairs/test/keypairs-test.js
index d24b4461..94881a26 100644
--- a/packages/ripple-keypairs/test/keypairs-test.js
+++ b/packages/ripple-keypairs/test/keypairs-test.js
@@ -181,7 +181,7 @@ describe('K256Pair', function() {
       it('can deterministically sign/verify message [' + i + ']', function() {
         const message = [i];
         const sig = key.sign(message);
-        assert.equal(utils.arrayToHex(sig), expected[i]);
+        assert.equal(utils.bytesToHex(sig), expected[i]);
         assert(key.verify(message, sig));
       });
     }