From 3dbb35a7087818a513f1ea0e96de1c1eef272027 Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Tue, 2 Dec 2014 12:40:42 -0300 Subject: [PATCH] Fixes build, add "mainnet" again and fixes uri --- lib/address.js | 2 +- lib/networks.js | 1 + test/uri.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/address.js b/lib/address.js index 6b17756..2d4e043 100644 --- a/lib/address.js +++ b/lib/address.js @@ -40,7 +40,7 @@ function Address(data, network, type) { throw new TypeError('First argument is required, please include address data.'); } - if (network && (network !== 'livenet' && network !== 'testnet')) { + if (network && !networks.get(network)) { throw new TypeError('Second argument must be "livenet" or "testnet".'); } diff --git a/lib/networks.js b/lib/networks.js index a37a5cf..fff435f 100644 --- a/lib/networks.js +++ b/lib/networks.js @@ -68,6 +68,7 @@ function getNetwork(arg) { module.exports = { defaultNetwork: livenet, livenet: livenet, + mainnet: livenet, testnet: testnet, get: getNetwork }; diff --git a/test/uri.js b/test/uri.js index 1eaa3da..da0b9cd 100644 --- a/test/uri.js +++ b/test/uri.js @@ -62,7 +62,7 @@ describe('URI', function() { uri = new URI('bitcoin:1DP69gMMvSuYhbnxsi4EJEFufUAbDrEQfj'); uri.address.should.be.instanceof(bitcore.Address); - uri.network.should.equal('mainnet'); + uri.network.should.equal('livenet'); uri = new URI('bitcoin:mkYY5NRvikVBY1EPtaq9fAFgquesdjqECw'); uri.address.should.be.instanceof(bitcore.Address); @@ -92,7 +92,7 @@ describe('URI', function() { address: '1DP69gMMvSuYhbnxsi4EJEFufUAbDrEQfj' }); uri.address.should.be.instanceof(bitcore.Address); - uri.network.should.equal('mainnet'); + uri.network.should.equal('livenet'); uri = new URI({ address: 'mkYY5NRvikVBY1EPtaq9fAFgquesdjqECw'