RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix problem with transaction by hash

Browse Source
This commit is contained in:
Manuel Araoz 2015-04-30 07:29:57 -03:00
parent 6628263b31
commit 49f26d3ae5
6 changed files with 1480 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1484
README.md
View File

File diff suppressed because it is too large Load Diff

7
api/controllers/blocks.js
View File

@ -1,11 +1,10 @@
'use strict'; 'use strict';
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var _ = bitcore.deps._;
var $ = bitcore.util.preconditions; var $ = bitcore.util.preconditions;
var Block = bitcore.Block; var Block = bitcore.Block;
var BitcoreNode = require('../../'); var errors = require('../../lib/errors');
var Blocks = {}; var Blocks = {};
@ -28,7 +27,7 @@ Blocks.blockHashParam = function(req, res, next, blockHash) {
req.block = block; req.block = block;
}) })
.then(next) .then(next)
.catch(BitcoreNode.errors.Blocks.NotFound, function() { .catch(errors.Blocks.NotFound, function() {
res.status(404).send('Block with id ' + blockHash + ' not found'); res.status(404).send('Block with id ' + blockHash + ' not found');
}) })
.catch(function() { .catch(function() {
@ -46,7 +45,7 @@ Blocks.heightParam = function(req, res, next, height) {
req.block = block; req.block = block;
}) })
.then(next) .then(next)
.catch(BitcoreNode.errors.Blocks.NotFound, function() { .catch(errors.Blocks.NotFound, function() {
res.status(404).send('Block with height ' + height + ' not found'); res.status(404).send('Block with height ' + height + ' not found');
}) })
.catch(function() { .catch(function() {

6
api/controllers/transactions.js
View File

@ -7,7 +7,7 @@ var _ = bitcore.deps._;
var $ = bitcore.util.preconditions; var $ = bitcore.util.preconditions;
var Transaction = bitcore.Transaction; var Transaction = bitcore.Transaction;
var BitcoreNode = require('../../'); var errors = require('../../lib/errors');
var Transactions = {}; var Transactions = {};
@ -30,7 +30,7 @@ Transactions.txHashParam = function(req, res, next, txHash) {
req.tx = tx; req.tx = tx;
}) })
.then(next) .then(next)
.catch(BitcoreNode.errors.Transactions.NotFound, function() { .catch(errors.Transactions.NotFound, function() {
res.status(404).send('Transaction with id ' + txHash + ' not found'); res.status(404).send('Transaction with id ' + txHash + ' not found');
}) })
.catch(function() { .catch(function() {
@ -81,7 +81,7 @@ Transactions.send = function(req, res) {
.then(function() { .then(function() {
res.send('Transaction broadcasted successfully'); res.send('Transaction broadcasted successfully');
}) })
.catch(BitcoreNode.errors.Transactions.CantBroadcast, function(err) { .catch(errors.Transactions.CantBroadcast, function(err) {
res.status(422).send(err.message); res.status(422).send(err.message);
}); });
}; };

1
index.js
View File

@ -1,7 +1,6 @@
'use strict'; 'use strict';
var BitcoreNode = require('./lib/node'); var BitcoreNode = require('./lib/node');
BitcoreNode.errors = require('./lib/errors');
var BitcoreHTTP = require('./api/lib/http'); var BitcoreHTTP = require('./api/lib/http');
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var Promise = require('bluebird'); var Promise = require('bluebird');

2
lib/node.js
View File

@ -223,4 +223,6 @@ BitcoreNode.prototype.sync = function() {
}); });
}; };
var errors = require('./errors');
BitcoreNode.errors = errors;
module.exports = BitcoreNode; module.exports = BitcoreNode;

5
lib/services/transaction.js
View File

@ -20,12 +20,11 @@ var LevelUp = require('levelup');
var Promise = require('bluebird'); var Promise = require('bluebird');
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var config = require('config'); var config = require('config');
var BitcoreNode = require('../../'); var errors = require('../errors');
var _ = bitcore.deps._; var _ = bitcore.deps._;
var $ = bitcore.util.preconditions; var $ = bitcore.util.preconditions;
var NULLTXHASH = bitcore.util.buffer.emptyBuffer(32).toString('hex');
var GENESISTX = '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b'; var GENESISTX = '4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b';
var helper = function(name) { var helper = function(name) {
@ -87,7 +86,7 @@ TransactionService.Index = Index;
var txNotFound = function(error) { var txNotFound = function(error) {
if (error.message === 'No information available about transaction') { if (error.message === 'No information available about transaction') {
throw new BitcoreNode.errors.Transactions.NotFound(); throw new errors.Transactions.NotFound();
} }
throw error; throw error;
}; };