From 9e32c892ef90abda3b1db3e0f459a7faf06bd4a0 Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Thu, 25 Feb 2016 13:26:05 +1100
Subject: [PATCH] ECPair/tests: always use WIF for error throwing
---
src/ecpair.js | 3 +--
test/ecpair.js | 4 +++-
test/fixtures/ecpair.json | 5 +++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/ecpair.js b/src/ecpair.js
index a01f363..d81b5be 100644
--- a/src/ecpair.js
+++ b/src/ecpair.js
@@ -58,7 +58,6 @@ ECPair.fromPublicKeyBuffer = function (buffer, network) {
}
ECPair.fromWIF = function (string, network) {
- network = network || NETWORKS.bitcoin
var buffer = bs58check.decode(string)
if (types.Array(network)) {
@@ -67,9 +66,9 @@ ECPair.fromWIF = function (string, network) {
network = network.filter(function (network) {
return version === network.wif
}).pop()
- if (!network) throw new Error('Invalid network version')
}
+ network = network || NETWORKS.bitcoin
var decoded = wif.decodeRaw(buffer, network.wif)
var d = BigInteger.fromBuffer(decoded.privateKey)
diff --git a/test/ecpair.js b/test/ecpair.js
index b7edbd0..f9e594a 100644
--- a/test/ecpair.js
+++ b/test/ecpair.js
@@ -107,7 +107,9 @@ describe('ECPair', function () {
fixtures.invalid.fromWIF.forEach(function (f) {
it('throws on ' + f.WIF, function () {
assert.throws(function () {
- ECPair.fromWIF(f.WIF)
+ var networks = f.network ? NETWORKS[f.network] : NETWORKS_LIST
+
+ ECPair.fromWIF(f.WIF, networks)
}, new RegExp(f.exception))
})
})
diff --git a/test/fixtures/ecpair.json b/test/fixtures/ecpair.json
index 652eb2d..d4e8cfb 100644
--- a/test/fixtures/ecpair.json
+++ b/test/fixtures/ecpair.json
@@ -107,8 +107,13 @@
"fromWIF": [
{
"exception": "Invalid network version",
+ "network": "bitcoin",
"WIF": "92Qba5hnyWSn5Ffcka56yMQauaWY6ZLd91Vzxbi4a9CCetaHtYj"
},
+ {
+ "exception": "Invalid network version",
+ "WIF": "brQnSed3Fia1w9VcbbS6ZGDgJ6ENkgwuQY2LS7pEC5bKHD1fMF"
+ },
{
"exception": "Invalid compression flag",
"WIF": "KwDiBf89QgGbjEhKnhXJuH7LrciVrZi3qYjgd9M7rFU73sfZr2ym"