From 589418d66c9b59db36f3960671d15480646069f2 Mon Sep 17 00:00:00 2001 From: Manan Patel Date: Mon, 4 Aug 2014 17:41:00 -0700 Subject: [PATCH] setting networks.livenet as the default for WalletKey --- lib/WalletKey.js | 4 ++-- test/test.WalletKey.js | 28 +++++++--------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/WalletKey.js b/lib/WalletKey.js index d7b0ecf..df63a71 100644 --- a/lib/WalletKey.js +++ b/lib/WalletKey.js @@ -3,11 +3,11 @@ var timeUtil = require('../util/time'); var Key = require('./Key'); var PrivateKey = require('./PrivateKey'); var Address = require('./Address'); +var networks = require('../networks'); function WalletKey(cfg) { if (!cfg) cfg = {}; - if (!cfg.network) throw new Error('network parameter is required'); - this.network = cfg.network; // required + this.network = cfg.network || networks.livenet; this.created = cfg.created; this.privKey = cfg.privKey; }; diff --git a/test/test.WalletKey.js b/test/test.WalletKey.js index 6bd8aba..bda7644 100644 --- a/test/test.WalletKey.js +++ b/test/test.WalletKey.js @@ -18,34 +18,24 @@ describe('WalletKey', function() { should.exist(WalletKey); }); it('should be able to create instance', function() { - var s = new WalletKey({ - network: networks.livenet - }); + var s = new WalletKey(); should.exist(s); }); it('should be able to call generate', function() { - var s = new WalletKey({ - network: networks.livenet - }); + var s = new WalletKey(); s.generate.bind(s).should.not.throw(Error); }); it('should be able to call storeObj', function() { - var s = new WalletKey({ - network: networks.livenet - }); + var s = new WalletKey(); s.generate(); var o = s.storeObj(); should.exist(o); }); it('roundtrip for storeObj/fromObj', function() { - var s = new WalletKey({ - network: networks.livenet - }); + var s = new WalletKey(); s.generate(); var obj = s.storeObj(); - var s2 = new WalletKey({ - network: networks.livenet - }); + var s2 = new WalletKey(); s2.fromObj(obj); s.privKey.private.toString().should.equal(s2.privKey.private.toString()); s.privKey.public.toString().should.equal(s2.privKey.public.toString()); @@ -69,9 +59,7 @@ describe('WalletKey', function() { //this is a WIF priv, compress flag = false var priv = '5KMpLZExnGzeU3oC9qZnKBt7yejLUS8boPiWag33TMX2XEK2Ayc'; - var s = new WalletKey({ - network: networks.livenet, - }); + var s = new WalletKey(); s.fromObj({ priv: priv}); s.privKey.compressed.should.equal(false); var o = s.storeObj(); @@ -85,9 +73,7 @@ describe('WalletKey', function() { //this is a WIF priv, compress flag = true var priv = 'L4cEVwoNDeYdCQfFJAGkGKPnE2TmqLEuBn4znQChD2ojjQRJVKpU'; - var s = new WalletKey({ - network: networks.livenet, - }); + var s = new WalletKey(); s.fromObj({ priv: priv}); s.privKey.compressed.should.equal(true); var o = s.storeObj();