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

Merge pull request #648 from braydonf/ref/default-networks 

Networks: Consistency of network reference and fix hardcoded value
This commit is contained in:
Braydon Fuller 2014-12-02 11:12:20 -05:00
parent 78ad47d215 968f9936d8
commit 3fc12e87d7
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/address.js
View File

@ -233,6 +233,7 @@ Address._transformString = function(data, network, type){
*/ */
Address.fromPublicKey = function(data, network){ Address.fromPublicKey = function(data, network){
var info = Address._transformPublicKey(data); var info = Address._transformPublicKey(data);
network = network || networks.defaultNetwork.name;
return new Address(info.hashBuffer, network, info.type); return new Address(info.hashBuffer, network, info.type);
}; };

2
lib/publickey.js
View File

@ -331,7 +331,7 @@ PublicKey.prototype.toDER = function(compressed) {
* @returns {Address} An address generated from the public key * @returns {Address} An address generated from the public key
*/ */
PublicKey.prototype.toAddress = function(network) { PublicKey.prototype.toAddress = function(network) {
return Address.fromPublicKey(this, network || 'livenet'); return Address.fromPublicKey(this, network);
}; };
/** /**

2
test/publickey.js
View File

@ -260,7 +260,7 @@ describe('PublicKey', function() {
it('should output this known mainnet address correctly', function() { it('should output this known mainnet address correctly', function() {
var pk = new PublicKey('03c87bd0e162f26969da8509cafcb7b8c8d202af30b928c582e263dd13ee9a9781'); var pk = new PublicKey('03c87bd0e162f26969da8509cafcb7b8c8d202af30b928c582e263dd13ee9a9781');
var address = pk.toAddress('mainnet'); var address = pk.toAddress('livenet');
address.toString().should.equal('1A6ut1tWnUq1SEQLMr4ttDh24wcbJ5o9TT'); address.toString().should.equal('1A6ut1tWnUq1SEQLMr4ttDh24wcbJ5o9TT');
}); });