From 32ac9bb63e8af1fe5e331daab5e8ab5a8f7e137f Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 12 Dec 2014 11:05:22 -0500 Subject: [PATCH] Change utility naming --- lib/address.js | 4 ++-- lib/networks.js | 1 - lib/unit.js | 4 ++-- lib/uri.js | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/address.js b/lib/address.js index 84191bd..815efde 100644 --- a/lib/address.js +++ b/lib/address.js @@ -3,7 +3,7 @@ var base58check = require('./encoding/base58check'); var Networks = require('./networks'); var Hash = require('./crypto/hash'); -var jsUtil = require('./util/js'); +var JSUtil = require('./util/js'); /** * Instantiate an address from an address String or Buffer, a public key or script hash Buffer, @@ -313,7 +313,7 @@ Address.fromString = function(str, network, type) { * @returns {Address} A new valid instance of an Address */ Address.fromJSON = function fromJSON(json) { - if (jsUtil.isValidJson(json)) { + if (JSUtil.isValidJson(json)) { json = JSON.parse(json); } var hashBuffer = new Buffer(json.hash, 'hex'); diff --git a/lib/networks.js b/lib/networks.js index 74806bf..1452d7a 100644 --- a/lib/networks.js +++ b/lib/networks.js @@ -2,7 +2,6 @@ var _ = require('lodash'); var BufferUtil = require('./util/buffer'); -var jsUtil = require('./util/js'); /** * A network is merely a map containing values that correspond to version diff --git a/lib/unit.js b/lib/unit.js index 61329bc..daad5c8 100644 --- a/lib/unit.js +++ b/lib/unit.js @@ -1,6 +1,6 @@ 'use strict'; -var jsUtil = require('./util/js'); +var JSUtil = require('./util/js'); /** * @@ -63,7 +63,7 @@ Object.keys(UNITS).forEach(function(key) { * @returns {Unit} A Unit instance */ Unit.fromJSON = function fromJSON(json){ - if (jsUtil.isValidJson(json)) { + if (JSUtil.isValidJson(json)) { json = JSON.parse(json); } return new Unit(json.amount, json.code); diff --git a/lib/uri.js b/lib/uri.js index c3cf847..949ed6b 100644 --- a/lib/uri.js +++ b/lib/uri.js @@ -5,7 +5,7 @@ var URL = require('url'); var Address = require('./address'); var Unit = require('./unit'); -var jsUtil = require('./util/js'); +var JSUtil = require('./util/js'); /** * Bitcore URI @@ -68,7 +68,7 @@ URI.fromString = function fromString(str) { * @returns {URI} A new instance of a URI */ URI.fromJSON = function fromJSON(json) { - if (jsUtil.isValidJson(json)) { + if (JSUtil.isValidJson(json)) { json = JSON.parse(json); } return new URI(json);