From 901d836231be118f36ac5220fb15769ddce16d36 Mon Sep 17 00:00:00 2001
From: Esteban Ordano <eordano@gmail.com>
Date: Wed, 31 Dec 2014 02:15:59 -0300
Subject: [PATCH] Add default network to PublicKey

Closes #871
---
 lib/publickey.js  |  2 +-
 test/publickey.js | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/publickey.js b/lib/publickey.js
index e8fc58fad..182b7aa86 100644
--- a/lib/publickey.js
+++ b/lib/publickey.js
@@ -64,7 +64,7 @@ var PublicKey = function PublicKey(data, extra) {
 
   Object.defineProperty(this, 'network', {
     configurable: false,
-    value: info.network
+    value: info.network || Network.defaultNetwork
   });
 
   return this;
diff --git a/test/publickey.js b/test/publickey.js
index 7220751de..de4011d42 100644
--- a/test/publickey.js
+++ b/test/publickey.js
@@ -8,8 +8,8 @@ var Point = bitcore.crypto.Point;
 var BN = bitcore.crypto.BN;
 var PublicKey = bitcore.PublicKey;
 var PrivateKey = bitcore.PrivateKey;
+var Networks = bitcore.Networks;
 
-// DER uncompressed format
 /* jshint maxlen: 200 */
 
 describe('PublicKey', function() {
@@ -65,6 +65,12 @@ describe('PublicKey', function() {
       publicKey.should.equal(publicKey2);
     });
 
+    it('sets the network to defaultNetwork if none provided', function() {
+      var publicKeyHex = '031ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a';
+      var publicKey = new PublicKey(publicKeyHex);
+      publicKey.network.should.equal(Networks.defaultNetwork);
+    });
+
     it('from a hex encoded DER string', function() {
       var pk = new PublicKey('041ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a7baad41d04514751e6851f5304fd243751703bed21b914f6be218c0fa354a341');
       should.exist(pk.point);
@@ -317,12 +323,12 @@ describe('PublicKey', function() {
   describe('#inspect', function() {
     it('should output known uncompressed pubkey for console', function() {
       var pubkey = PublicKey.fromString('041ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a7baad41d04514751e6851f5304fd243751703bed21b914f6be218c0fa354a341');
-      pubkey.inspect().should.equal('<PublicKey: 041ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a7baad41d04514751e6851f5304fd243751703bed21b914f6be218c0fa354a341, uncompressed>');
+      pubkey.inspect().should.equal('<PublicKey: 041ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a7baad41d04514751e6851f5304fd243751703bed21b914f6be218c0fa354a341, uncompressed, network: livenet>');
     });
 
     it('should output known compressed pubkey for console', function() {
       var pubkey = PublicKey.fromString('031ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a');
-      pubkey.inspect().should.equal('<PublicKey: 031ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a>');
+      pubkey.inspect().should.equal('<PublicKey: 031ff0fe0f7b15ffaa85ff9f4744d539139c252a49710fb053bb9f2b933173ff9a, network: livenet>');
     });
 
     it('should output known compressed pubkey with network for console', function() {