diff --git a/lib/privatekey.js b/lib/privatekey.js index 794860c..ac49996 100644 --- a/lib/privatekey.js +++ b/lib/privatekey.js @@ -283,12 +283,21 @@ PrivateKey.isValid = function(data, network){ return !PrivateKey.getValidationError(data, network); }; +/** + * Will output the PrivateKey encoded as hex string + * + * @returns {String} + */ +PrivateKey.prototype.toString = function() { + return this.toBuffer().toString('hex'); +} + /** * Will output the PrivateKey to a WIF string * * @returns {String} A WIP representation of the private key */ -PrivateKey.prototype.toString = PrivateKey.prototype.toWIF = function() { +PrivateKey.prototype.toWIF = function() { var network = this.network; var compressed = this.compressed; diff --git a/lib/publickey.js b/lib/publickey.js index 182b7aa..3ce6f8e 100644 --- a/lib/publickey.js +++ b/lib/publickey.js @@ -409,8 +409,7 @@ PublicKey.prototype.toAddress = function(network) { * @returns {String} A DER hex encoded string */ PublicKey.prototype.toString = function() { - var compressed = _.isUndefined(this.compressed) || this.compressed; - return this.toDER(compressed).toString('hex'); + return this.toDER().toString('hex'); }; /** diff --git a/test/privatekey.js b/test/privatekey.js index dcaab92..2a03e38 100644 --- a/test/privatekey.js +++ b/test/privatekey.js @@ -142,7 +142,7 @@ describe('PrivateKey', function() { it('should create a livenet private key', function() { var privkey = new PrivateKey(BN.fromBuffer(buf), 'livenet'); - privkey.toString().should.equal(wifLivenet); + privkey.toWIF().should.equal(wifLivenet); }); it('should create a default network private key', function() { @@ -204,7 +204,7 @@ describe('PrivateKey', function() { it('should output this address correctly', function() { var privkey = PrivateKey.fromWIF(wifLivenetUncompressed); - privkey.toString().should.equal(wifLivenetUncompressed); + privkey.toWIF().should.equal(wifLivenetUncompressed); }); }); @@ -228,20 +228,20 @@ describe('PrivateKey', function() { it('should output known livenet address for console', function() { var privkey = PrivateKey.fromWIF('L3T1s1TYP9oyhHpXgkyLoJFGniEgkv2Jhi138d7R2yJ9F4QdDU2m'); privkey.inspect().should.equal( - '' + '' ); }); it('should output known testnet address for console', function() { var privkey = PrivateKey.fromWIF('cR4qogdN9UxLZJXCNFNwDRRZNeLRWuds9TTSuLNweFVjiaE4gPaq'); privkey.inspect().should.equal( - '' + '' ); }); it('outputs "uncompressed" for uncompressed imported WIFs', function() { var privkey = PrivateKey.fromWIF(wifLivenetUncompressed); - privkey.inspect().should.equal(''); + privkey.inspect().should.equal(''); }); }); @@ -268,7 +268,7 @@ describe('PrivateKey', function() { describe('#toBuffer', function() { it('should output known buffer', function() { var privkey = new PrivateKey(BN.fromBuffer(buf), 'livenet'); - privkey.toBuffer().toString('hex').should.equal(buf.toString('hex')); + privkey.toString().should.equal(buf.toString('hex')); }); }); @@ -323,7 +323,7 @@ describe('PrivateKey', function() { it('should parse this uncompressed livenet address correctly', function() { var privkey = PrivateKey.fromString(wifLivenetUncompressed); - privkey.toString().should.equal(wifLivenetUncompressed); + privkey.toString().should.equal("96c132224121b509b7d0a16245e957d9192609c5637c6228311287b1be21627a"); }); });