Don't pollute the Bitcoin.Util namespace with overrides from Crypto.u…

…til.
nixoid · Mar 25, 2014 · 744b0f7 · 744b0f7
1 parent 84a4296
commit 744b0f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/util.js b/src/util.js
@@ -194,6 +194,17 @@ Bitcoin.Util = {
     return bytes;
   },
 
+  bytesToHex: function (bytes) {
+    for (var hex = [], i = 0; i < bytes.length; i++) {
+      if (bytes[i] > 0xff) {
+        throw 'illegal input';
+      }
+      hex.push((bytes[i] >>> 4).toString(16));
+      hex.push((bytes[i] & 0xF).toString(16));
+    }
+    return hex.join("");
+  },
+
   /**
    * Parse a Bitcoin value byte array, returning a BigInteger.
    */
@@ -267,9 +278,3 @@ Bitcoin.Util = {
     return Crypto.SHA256(Crypto.SHA256(data, { asBytes: true }), { asBytes: true });
   }
 };
-
-for (var i in Crypto.util) {
-  if (Crypto.util.hasOwnProperty(i)) {
-    Bitcoin.Util[i] = Crypto.util[i];
-  }
-}
diff --git a/test/test.js b/test/test.js
@@ -571,9 +571,9 @@ test("bytesToBase64 - ok", function() {
 
   for (var index = 0; index < testArrays.length; ++index) {
     var a = testArrays[index];
-    var s = Bitcoin.Util.bytesToBase64(a);
+    var s = Crypto.util.bytesToBase64(a);
     ok(s, 'encoded test array #' + index);
-    var a2 = Bitcoin.Util.base64ToBytes(s);
+    var a2 = Crypto.util.base64ToBytes(s);
     ok(a2, 'decoded test array #' + index);
     deepEqual(a, a2, 'decoded array #' + index + ' matched');
   }