refactor tx inputs selection

lib/server.js

@@ -464,8 +464,16 @@ WalletService.prototype.getBalance = function(opts, cb) {
   });
 };
 
+WalletService.prototype._selectTxInputs = function(txp, cb) {
+  var self = this;
+
+  self._getUtxos(function(err, utxos) {
+    if (err) return cb(err);
+
+    utxos = _.reject(utxos, {
+      locked: true
+    });
 
-WalletService.prototype._selectUtxos = function(txp, utxos) {
     var i = 0;
     var total = 0;
     var selected = [];
@@ -480,17 +488,18 @@ WalletService.prototype._selectUtxos = function(txp, utxos) {
           // Check if there are enough fees
           txp.inputs = selected;
           var raw = txp.getRawTx();
-        return;
+          txp.inputPaths = _.pluck(txp.inputs, 'path');
+          return cb();
         } catch (ex) {
           if (ex.name != 'bitcore.ErrorTransactionFeeError') {
-          throw ex.message;
+            return cb(ex);
           }
         }
       }
       i++;
     };
-  txp.inputs = null;
+    return cb(new ClientError('INSUFFICIENTFUNDS', 'Insufficient funds'));
-  return;
+  });
 };
 
 
@@ -534,15 +543,9 @@ WalletService.prototype.createTx = function(opts, cb) {
       if (opts.amount < Bitcore.Transaction.DUST_AMOUNT)
         return cb(new ClientError('DUSTAMOUNT', 'Amount below dust threshold'));
 
-      self._getUtxos(function(err, utxos) {
-        if (err) return cb(err);
 
       var changeAddress = wallet.createAddress(true);
 
-        utxos = _.reject(utxos, {
-          locked: true
-        });
-
       var txp = TxProposal.create({
         creatorId: self.copayerId,
         toAddress: opts.toAddress,
@@ -554,16 +557,11 @@ WalletService.prototype.createTx = function(opts, cb) {
         requiredRejections: Math.min(wallet.m, wallet.n - wallet.m + 1),
       });
 
-        try {
-          self._selectUtxos(txp, utxos);
-        } catch (ex) {
-          return cb(new ClientError(ex.toString()));
-        }
 
-        if (!txp.inputs)
+      self._selectTxInputs(txp, function(err) {
-          return cb(new ClientError('INSUFFICIENTFUNDS', 'Insufficient funds'));
+        if (err) return cb(err);
 
-        txp.inputPaths = _.pluck(txp.inputs, 'path');
+        $.checkState(txp.inputs);
 
         self.storage.storeAddressAndWallet(wallet, changeAddress, function(err) {
           if (err) return cb(err);

test/integration/server.js

@@ -984,7 +984,7 @@ describe('Copay server', function() {
       });
     });
 
-    it.only('should fail with different error for insufficient funds and locked funds', function(done) {
+    it('should fail with different error for insufficient funds and locked funds', function(done) {
       helpers.stubUtxos(server, wallet, [10, 10], function() {
         var txOpts = helpers.createProposalOpts('18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7', 11, null, TestData.copayers[0].privKey_1H_0);
         server.createTx(txOpts, function(err, tx) {