From f26995c31bba3265e545ee41dc58942456d5d6e4 Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Tue, 26 Aug 2014 11:13:29 -0300 Subject: [PATCH 1/4] add space --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b3015af0a..1a38648fb 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ [![Stories in Ready](https://badge.waffle.io/bitpay/copay.svg?label=ready&title=Ready)](https://waffle.io/bitpay/copay) + Copay is a secure bitcoin wallet for friends and companies. Easy-to-use multisignature bitcoin wallet, bringing corporate-level security to ordinary people. From f8c665ce2e89fa09b47130213330c6820be50117 Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Tue, 26 Aug 2014 11:20:13 -0300 Subject: [PATCH 2/4] rm space --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1a38648fb..b3015af0a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ [![Stories in Ready](https://badge.waffle.io/bitpay/copay.svg?label=ready&title=Ready)](https://waffle.io/bitpay/copay) - Copay is a secure bitcoin wallet for friends and companies. Easy-to-use multisignature bitcoin wallet, bringing corporate-level security to ordinary people. From d4ce4e3c01f89df302edcbb16f47e369f57ee8db Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Tue, 26 Aug 2014 17:01:41 -0300 Subject: [PATCH 3/4] Added a test to PublicKeyRing to increase coverage --- js/models/core/PublicKeyRing.js | 6 +++--- test/test.PublicKeyRing.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js index b86f18277..1d0537a09 100644 --- a/js/models/core/PublicKeyRing.js +++ b/js/models/core/PublicKeyRing.js @@ -43,9 +43,9 @@ PublicKeyRing.trim = function(data) { }; PublicKeyRing.fromObj = function(data) { - if (data instanceof PublicKeyRing) { - throw new Error('bad data format: Did you use .toObj()?'); - } + preconditions.checkArgument(typeof data !== 'PublicKeyRing'); + + var opts = PublicKeyRing.trim(data); // Support old indexes schema diff --git a/test/test.PublicKeyRing.js b/test/test.PublicKeyRing.js index 4fe8b0f5a..3adfa5231 100644 --- a/test/test.PublicKeyRing.js +++ b/test/test.PublicKeyRing.js @@ -434,6 +434,21 @@ describe('PublicKeyRing model', function() { w.nicknameForIndex(4).should.equal('juan1'); }); + it('#fromObj with error', function() { + + var config = { + networkName: 'livenet', + }; + var pkr = new PublicKeyRing(config); + + + (function () + { + PublicKeyRing.fromObj(pkr); + } + ).should.throw('bad data format: Did you use .toObj()?'); + }); + it('#toObj #fromObj with nickname', function() { var config = { From 028f3dbd8dcad6a3be1df5a02c4323d82bc1324d Mon Sep 17 00:00:00 2001 From: Matias Pando Date: Wed, 27 Aug 2014 11:13:32 -0300 Subject: [PATCH 4/4] Fixing test PublicKeyRing --- js/models/core/PublicKeyRing.js | 2 +- test/test.PublicKeyRing.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js index 1d0537a09..ce9b332a0 100644 --- a/js/models/core/PublicKeyRing.js +++ b/js/models/core/PublicKeyRing.js @@ -43,7 +43,7 @@ PublicKeyRing.trim = function(data) { }; PublicKeyRing.fromObj = function(data) { - preconditions.checkArgument(typeof data !== 'PublicKeyRing'); + preconditions.checkArgument(!(data instanceof PublicKeyRing), 'bad data format: Did you use .toObj()?'); var opts = PublicKeyRing.trim(data); diff --git a/test/test.PublicKeyRing.js b/test/test.PublicKeyRing.js index 3adfa5231..658c9a4de 100644 --- a/test/test.PublicKeyRing.js +++ b/test/test.PublicKeyRing.js @@ -441,7 +441,6 @@ describe('PublicKeyRing model', function() { }; var pkr = new PublicKeyRing(config); - (function () { PublicKeyRing.fromObj(pkr);