fix conflicts

2014-01-23 17:38:30 -03:00 · 2014-01-23 17:38:30 -03:00 · fbb5e943cb
parent 0de7bcc132
commit fbb5e943cb
1 changed files with 7 additions and 1 deletions
--- a/app/controllers/transactions.js
+++ b/app/controllers/transactions.js
@ -43,7 +43,13 @@ var getTransaction = function(txid, cb) {
      return cb(err);
    }

-    if (!tx) return cb(new Error('Transaction not found'));
+    if (!tx) {
+console.log('[transactions.js.48]:: TXid %d not found in RPC. CHECK THIS.', txid); //TODO
+      // not check this. no
+      tx.info = {
+        txid: txid,
+      };
+    }

    return cb(null, tx.info);
  });