Consistent names for utilities
This commit is contained in:
parent
94cc10b1a3
commit
3276236cce
12
lib/block.js
12
lib/block.js
|
@ -3,11 +3,11 @@
|
||||||
var _ = require('lodash');
|
var _ = require('lodash');
|
||||||
var BlockHeader = require('./blockheader');
|
var BlockHeader = require('./blockheader');
|
||||||
var BN = require('./crypto/bn');
|
var BN = require('./crypto/bn');
|
||||||
var bu = require('./util/buffer');
|
var bufferUtil = require('./util/buffer');
|
||||||
var BufferReader = require('./encoding/bufferreader');
|
var BufferReader = require('./encoding/bufferreader');
|
||||||
var BufferWriter = require('./encoding/bufferwriter');
|
var BufferWriter = require('./encoding/bufferwriter');
|
||||||
var Hash = require('./crypto/hash');
|
var Hash = require('./crypto/hash');
|
||||||
var ju = require('./util/js');
|
var jsUtil = require('./util/js');
|
||||||
var Transaction = require('./transaction');
|
var Transaction = require('./transaction');
|
||||||
var Varint = require('./encoding/varint');
|
var Varint = require('./encoding/varint');
|
||||||
|
|
||||||
|
@ -35,9 +35,9 @@ var Block = function Block(arg) {
|
||||||
*/
|
*/
|
||||||
Block._from = function _from(arg) {
|
Block._from = function _from(arg) {
|
||||||
var info = {};
|
var info = {};
|
||||||
if (bu.isBuffer(arg)) {
|
if (bufferUtil.isBuffer(arg)) {
|
||||||
info = Block._fromBufferReader(BufferReader(arg));
|
info = Block._fromBufferReader(BufferReader(arg));
|
||||||
} else if (ju.isValidJSON(arg)) {
|
} else if (jsUtil.isValidJSON(arg)) {
|
||||||
info = Block._fromJSON(arg);
|
info = Block._fromJSON(arg);
|
||||||
} else if (_.isObject(arg)) {
|
} else if (_.isObject(arg)) {
|
||||||
info = {
|
info = {
|
||||||
|
@ -59,7 +59,7 @@ Block._from = function _from(arg) {
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
Block._fromJSON = function _fromJSON(data) {
|
Block._fromJSON = function _fromJSON(data) {
|
||||||
if (ju.isValidJSON(data)) {
|
if (jsUtil.isValidJSON(data)) {
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
}
|
}
|
||||||
var txs = [];
|
var txs = [];
|
||||||
|
@ -135,7 +135,7 @@ Block.fromString = function fromString(str) {
|
||||||
* @returns {Block} - An instance of block
|
* @returns {Block} - An instance of block
|
||||||
*/
|
*/
|
||||||
Block.fromRawBlock = function fromRawBlock(data) {
|
Block.fromRawBlock = function fromRawBlock(data) {
|
||||||
if (!bu.isBuffer(data)) {
|
if (!bufferUtil.isBuffer(data)) {
|
||||||
data = new Buffer(data, 'binary');
|
data = new Buffer(data, 'binary');
|
||||||
}
|
}
|
||||||
var br = BufferReader(data);
|
var br = BufferReader(data);
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
var _ = require('lodash');
|
var _ = require('lodash');
|
||||||
var BN = require('./crypto/bn');
|
var BN = require('./crypto/bn');
|
||||||
var bu = require('./util/buffer');
|
var bufferUtil = require('./util/buffer');
|
||||||
var BufferReader = require('./encoding/bufferreader');
|
var BufferReader = require('./encoding/bufferreader');
|
||||||
var BufferWriter = require('./encoding/bufferwriter');
|
var BufferWriter = require('./encoding/bufferwriter');
|
||||||
var Hash = require('./crypto/hash');
|
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
|
* 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) {
|
BlockHeader._from = function _from(arg) {
|
||||||
var info = {};
|
var info = {};
|
||||||
if (bu.isBuffer(arg)) {
|
if (bufferUtil.isBuffer(arg)) {
|
||||||
info = BlockHeader._fromBufferReader(BufferReader(arg));
|
info = BlockHeader._fromBufferReader(BufferReader(arg));
|
||||||
} else if (ju.isValidJSON(arg)) {
|
} else if (jsUtil.isValidJSON(arg)) {
|
||||||
info = BlockHeader._fromJSON(arg);
|
info = BlockHeader._fromJSON(arg);
|
||||||
} else if (_.isObject(arg)) {
|
} else if (_.isObject(arg)) {
|
||||||
info = {
|
info = {
|
||||||
|
@ -57,7 +57,7 @@ BlockHeader._from = function _from(arg) {
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
BlockHeader._fromJSON = function _fromJSON(data) {
|
BlockHeader._fromJSON = function _fromJSON(data) {
|
||||||
if (ju.isValidJSON(data)) {
|
if (jsUtil.isValidJSON(data)) {
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
}
|
}
|
||||||
var info = {
|
var info = {
|
||||||
|
@ -85,7 +85,7 @@ BlockHeader.fromJSON = function fromJSON(json) {
|
||||||
* @returns {BlockHeader} - An instance of block header
|
* @returns {BlockHeader} - An instance of block header
|
||||||
*/
|
*/
|
||||||
BlockHeader.fromRawBlock = function fromRawBlock(data) {
|
BlockHeader.fromRawBlock = function fromRawBlock(data) {
|
||||||
if (!bu.isBuffer(data)) {
|
if (!bufferUtil.isBuffer(data)) {
|
||||||
data = new Buffer(data, 'binary');
|
data = new Buffer(data, 'binary');
|
||||||
}
|
}
|
||||||
var br = BufferReader(data);
|
var br = BufferReader(data);
|
||||||
|
|
Loading…
Reference in New Issue