BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #735 from braydonf/bug/js-util-naming 

Fixed issue with js util naming
This commit is contained in:
Braydon Fuller 2014-12-12 18:01:09 -05:00
parent 04fba31293 0e7f5e89f2
commit feb3aa3150
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/privatekey.js
View File

@ -189,7 +189,7 @@ PrivateKey.fromWIF = function(str) {
* @returns {PrivateKey} A new valid instance of PrivateKey * @returns {PrivateKey} A new valid instance of PrivateKey
*/ */
PrivateKey.fromJSON = function(json) { PrivateKey.fromJSON = function(json) {
if (JSUtil.isValidJson(json)) { if (JSUtil.isValidJSON(json)) {
json = JSON.parse(json); json = JSON.parse(json);
} }
var bn = BN(json.bn, 'hex'); var bn = BN(json.bn, 'hex');

2
lib/publickey.js
View File

@ -162,7 +162,7 @@ PublicKey._transformX = function(odd, x){
* @returns {PublicKey} A new valid instance of PublicKey * @returns {PublicKey} A new valid instance of PublicKey
*/ */
PublicKey.fromJSON = function(json) { PublicKey.fromJSON = function(json) {
if (JSUtil.isValidJson(json)) { if (JSUtil.isValidJSON(json)) {
json = JSON.parse(json); json = JSON.parse(json);
} }
var x = BN(json.x, 'hex'); var x = BN(json.x, 'hex');