From 3276236ccea31d394edeceb806c5987c664e06fe Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Thu, 11 Dec 2014 22:24:41 -0500
Subject: [PATCH] Consistent names for utilities

---
 lib/block.js       | 12 ++++++------
 lib/blockheader.js | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/block.js b/lib/block.js
index 1a2f051..d0ceb42 100644
--- a/lib/block.js
+++ b/lib/block.js
@@ -3,11 +3,11 @@
 var _ = require('lodash');
 var BlockHeader = require('./blockheader');
 var BN = require('./crypto/bn');
-var bu = require('./util/buffer');
+var bufferUtil = require('./util/buffer');
 var BufferReader = require('./encoding/bufferreader');
 var BufferWriter = require('./encoding/bufferwriter');
 var Hash = require('./crypto/hash');
-var ju = require('./util/js');
+var jsUtil = require('./util/js');
 var Transaction = require('./transaction');
 var Varint = require('./encoding/varint');
 
@@ -35,9 +35,9 @@ var Block = function Block(arg) {
  */
 Block._from = function _from(arg) {
   var info = {};
-  if (bu.isBuffer(arg)) {
+  if (bufferUtil.isBuffer(arg)) {
     info = Block._fromBufferReader(BufferReader(arg));
-  } else if (ju.isValidJSON(arg)) {
+  } else if (jsUtil.isValidJSON(arg)) {
     info = Block._fromJSON(arg);
   } else if (_.isObject(arg)) {
     info = {
@@ -59,7 +59,7 @@ Block._from = function _from(arg) {
  * @private
  */
 Block._fromJSON = function _fromJSON(data) {
-  if (ju.isValidJSON(data)) {
+  if (jsUtil.isValidJSON(data)) {
     data = JSON.parse(data);
   }
   var txs = [];
@@ -135,7 +135,7 @@ Block.fromString = function fromString(str) {
  * @returns {Block} - An instance of block
  */
 Block.fromRawBlock = function fromRawBlock(data) {
-  if (!bu.isBuffer(data)) {
+  if (!bufferUtil.isBuffer(data)) {
     data = new Buffer(data, 'binary');
   }
   var br = BufferReader(data);
diff --git a/lib/blockheader.js b/lib/blockheader.js
index 0be94d4..62999e8 100644
--- a/lib/blockheader.js
+++ b/lib/blockheader.js
@@ -2,11 +2,11 @@
 
 var _ = require('lodash');
 var BN = require('./crypto/bn');
-var bu = require('./util/buffer');
+var bufferUtil = require('./util/buffer');
 var BufferReader = require('./encoding/bufferreader');
 var BufferWriter = require('./encoding/bufferwriter');
 var Hash = require('./crypto/hash');
-var ju = require('./util/js');
+var jsUtil = require('./util/js');
 
 /**
  * Instantiate a BlockHeader from a Buffer, JSON object, or Object with
@@ -32,9 +32,9 @@ var BlockHeader = function BlockHeader(arg) {
  */
 BlockHeader._from = function _from(arg) {
   var info = {};
-  if (bu.isBuffer(arg)) {
+  if (bufferUtil.isBuffer(arg)) {
     info = BlockHeader._fromBufferReader(BufferReader(arg));
-  } else if (ju.isValidJSON(arg)) {
+  } else if (jsUtil.isValidJSON(arg)) {
     info = BlockHeader._fromJSON(arg);
   } else if (_.isObject(arg)) {
     info = {
@@ -57,7 +57,7 @@ BlockHeader._from = function _from(arg) {
  * @private
  */
 BlockHeader._fromJSON = function _fromJSON(data) {
-  if (ju.isValidJSON(data)) {
+  if (jsUtil.isValidJSON(data)) {
     data = JSON.parse(data);
   }
   var info = {
@@ -85,7 +85,7 @@ BlockHeader.fromJSON = function fromJSON(json) {
  * @returns {BlockHeader} - An instance of block header
  */
 BlockHeader.fromRawBlock = function fromRawBlock(data) {
-  if (!bu.isBuffer(data)) {
+  if (!bufferUtil.isBuffer(data)) {
     data = new Buffer(data, 'binary');
   }
   var br = BufferReader(data);