Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/address.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,14 @@ Address._transformBuffer = function(buffer, network, type) {
throw new TypeError('Address buffers must be exactly 21 bytes.');
}

network = Networks.get(network);
var networkObj = Networks.get(network);
var bufferVersion = Address._classifyFromVersion(buffer);

if (!bufferVersion.network || (network && network !== bufferVersion.network)) {
if (network && !networkObj) {
throw new TypeError('Unknown network');
}

if (!bufferVersion.network || (networkObj && networkObj !== bufferVersion.network)) {
throw new TypeError('Address has mismatched network type.');
}

Expand Down
6 changes: 6 additions & 0 deletions test/address.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@ describe('Address', function() {
Address.fromString(str, Networks.livenet).toString().should.equal(str);
});

it('should throw with bad network param', function() {
(function(){
Address.fromString(str, 'somenet');
}).should.throw('Unknown network');
});

it('should error because of unrecognized data format', function() {
(function() {
return new Address(new Error());
Expand Down
5 changes: 4 additions & 1 deletion test/networks.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ describe('Networks', function() {
networks.add(custom);
var network = networks.get(undefined);
should.not.exist(network);
networks.remove(custom);
var somenet = networks.get('somenet');
should.exist(somenet);
somenet.name.should.equal('somenet');
networks.remove(somenet);
});

var constants = ['name', 'alias', 'pubkeyhash', 'scripthash', 'xpubkey', 'xprivkey'];
Expand Down