From 90dfc17ab5c5c5b1b313cd1f25afba06f55cefbe Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Tue, 4 Aug 2015 12:07:25 -0300 Subject: [PATCH] new error for address network mismatch --- lib/errors/errordefinitions.js | 1 + lib/server.js | 4 ++-- test/integration/server.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/errors/errordefinitions.js b/lib/errors/errordefinitions.js index 72f7f10..877be20 100644 --- a/lib/errors/errordefinitions.js +++ b/lib/errors/errordefinitions.js @@ -11,6 +11,7 @@ var errors = { COPAYER_REGISTERED: 'Copayer ID already registered on server', COPAYER_VOTED: 'Copayer already voted on this transaction proposal', DUST_AMOUNT: 'Amount below dust threshold', + INCORRECT_ADDRESS_NETWORK: 'Incorrect address network', INSUFFICIENT_FUNDS: 'Insufficient funds', INSUFFICIENT_FUNDS_FOR_FEE: 'Insufficient funds for fee', INVALID_ADDRESS: 'Invalid address', diff --git a/lib/server.js b/lib/server.js index c558b34..9f6da6f 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1009,11 +1009,11 @@ WalletService.prototype.createTx = function(opts, cb) { try { toAddress = new Bitcore.Address(output.toAddress); } catch (ex) { - cb(new ClientError(Errors.codes.INVALID_ADDRESS, 'Invalid address')); + cb(Errors.INVALID_ADDRESS); return false; } if (toAddress.network != wallet.getNetworkName()) { - cb(new ClientError(Errors.codes.INVALID_ADDRESS, 'Incorrect address network')); + cb(Errors.INCORRECT_ADDRESS_NETWORK); return false; } if (!_.isNumber(output.amount) || _.isNaN(output.amount) || output.amount <= 0) { diff --git a/test/integration/server.js b/test/integration/server.js index 3f68f96..4b5e217 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -1779,7 +1779,7 @@ describe('Wallet service', function() { server.createTx(txOpts, function(err, tx) { should.not.exist(tx); should.exist(err); - err.code.should.equal('INVALID_ADDRESS'); + err.code.should.equal('INCORRECT_ADDRESS_NETWORK'); err.message.should.equal('Incorrect address network'); done(); });