RanchiMall/flocore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed *Json to *JSON and returned an object so that methods can be called from other toJSON methods without the double-stringification issue.

Browse Source
This commit is contained in:
Braydon Fuller 2014-12-11 21:00:51 -05:00
parent f108cc7ea5
commit 94cc10b1a3
7 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/block.js
View File

@ -37,7 +37,7 @@ Block._from = function _from(arg) {
var info = {};
if (bu.isBuffer(arg)) {
info = Block._fromBufferReader(BufferReader(arg));
} else if (ju.isValidJson(arg)) {
} else if (ju.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 (ju.isValidJSON(data)) {
data = JSON.parse(data);
}
var txs = [];

4
lib/blockheader.js
View File

@ -34,7 +34,7 @@ BlockHeader._from = function _from(arg) {
var info = {};
if (bu.isBuffer(arg)) {
info = BlockHeader._fromBufferReader(BufferReader(arg));
} else if (ju.isValidJson(arg)) {
} else if (ju.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 (ju.isValidJSON(data)) {
data = JSON.parse(data);
}
var info = {

18
lib/hdprivatekey.js
View File

@ -45,8 +45,8 @@ function HDPrivateKey(arg) {
if (_.isString(arg) || bufferUtil.isBuffer(arg)) {
if (HDPrivateKey.isValidSerialized(arg)) {
this._buildFromSerialized(arg);
} else if (jsUtil.isValidJson(arg)) {
this._buildFromJson(arg);
} else if (jsUtil.isValidJSON(arg)) {
this._buildFromJSON(arg);
} else {
throw HDPrivateKey.getSerializedError(arg);
}
@ -212,7 +212,7 @@ HDPrivateKey._validateNetwork = function(data, networkArg) {
return null;
};
HDPrivateKey.prototype._buildFromJson = function(arg) {
HDPrivateKey.prototype._buildFromJSON = function(arg) {
return this._buildFromObject(JSON.parse(arg));
};
@ -406,7 +406,7 @@ HDPrivateKey.prototype.toString = function() {
*
* @return {Object}
*/
HDPrivateKey.prototype.toObject = function() {
HDPrivateKey.prototype.toJSON = function() {
return {
network: Network.get(bufferUtil.integerFromBuffer(this._buffers.version)).name,
depth: bufferUtil.integerFromSingleByteBuffer(this._buffers.depth),
@ -420,16 +420,6 @@ HDPrivateKey.prototype.toObject = function() {
};
};
/**
* Returns a string with the results from <tt>toObject</tt>
*
* @see {HDPrivateKey#toObject}
* @return {string}
*/
HDPrivateKey.prototype.toJson = function() {
return JSON.stringify(this.toObject());
};
HDPrivateKey.DefaultDepth = 0;
HDPrivateKey.DefaultFingerprint = 0;
HDPrivateKey.DefaultChildIndex = 0;

18
lib/hdpublickey.js
View File

@ -41,8 +41,8 @@ function HDPublicKey(arg) {
var error = HDPublicKey.getSerializedError(arg);
if (!error) {
return this._buildFromSerialized(arg);
} else if (jsUtil.isValidJson(arg)) {
return this._buildFromJson(arg);
} else if (jsUtil.isValidJSON(arg)) {
return this._buildFromJSON(arg);
} else {
if (error instanceof hdErrors.ArgumentIsPrivateExtended) {
return new HDPrivateKey(arg).hdPublicKey;
@ -211,7 +211,7 @@ HDPublicKey._validateNetwork = function (data, networkArg) {
return null;
};
HDPublicKey.prototype._buildFromJson = function (arg) {
HDPublicKey.prototype._buildFromJSON = function (arg) {
return this._buildFromObject(JSON.parse(arg));
};
@ -366,7 +366,7 @@ HDPublicKey.prototype.toString = function () {
* * xpubkey: the string with the base58 representation of this extended key
* * checksum: the base58 checksum of xpubkey
*/
HDPublicKey.prototype.toObject = function () {
HDPublicKey.prototype.toJSON = function () {
return {
network: Network.get(bufferUtil.integerFromBuffer(this._buffers.version)).name,
depth: bufferUtil.integerFromSingleByteBuffer(this._buffers.depth),
@ -380,16 +380,6 @@ HDPublicKey.prototype.toObject = function () {
};
};
/**
* Returns the JSON representation of this key's <tt>toObject</tt> result
*
* @see {HDPublicKey#toObject}
* @return {string}
*/
HDPublicKey.prototype.toJson = function () {
return JSON.stringify(this.toObject());
};
HDPublicKey.Hardened = 0x80000000;
HDPublicKey.RootElementAlias = ['m', 'M'];

2
lib/util/js.js
View File

@ -23,7 +23,7 @@ module.exports = {
* @param {string} arg
* @return {Object|boolean} false if the argument is not a JSON string.
*/
isValidJson: function isValidJson(arg) {
isValidJSON: function isValidJSON(arg) {
try {
return JSON.parse(arg);
} catch (e) {

4
test/hdprivatekey.js
View File

@ -68,8 +68,8 @@ describe('HDPrivate key interface', function() {
it('builds a json keeping the structure and same members', function() {
assert(_.isEqual(
JSON.parse(new HDPrivateKey(json).toJson()),
JSON.parse(new HDPrivateKey(xprivkey).toJson())
new HDPrivateKey(json).toJSON(),
new HDPrivateKey(xprivkey).toJSON()
));
});

4
test/hdpublickey.js
View File

@ -106,8 +106,8 @@ describe('HDPublicKey interface', function() {
it('can generate a json that has a particular structure', function() {
assert(_.isEqual(
JSON.parse(new HDPublicKey(json).toJson()),
JSON.parse(new HDPublicKey(xpubkey).toJson())
new HDPublicKey(json).toJSON(),
new HDPublicKey(xpubkey).toJSON()
));
});