zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove braces, fix benchmark and pass callback.

This commit is contained in:
Braydon Fuller 2015-07-16 16:09:30 -04:00
parent 9020ddb85c
commit b738a5fb84
3 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/index.js
View File

@ -90,7 +90,7 @@ bitcoind.on('ready', function() {
c = 0;
}
var hash = fixtureData.txHashes[c];
bitcoind.getTransaction(hash, function(err, tx) {
bitcoind.getTransaction(hash, true, function(err, tx) {
if (err) {
throw err;
}

7
lib/bitcoind.js
View File

@ -328,12 +328,7 @@ Bitcoin.prototype.isSpent = function(txid, outputIndex) {
};
Bitcoin.prototype.getTransaction = function(txid, queryMempool, callback) {
return bitcoindjs.getTransaction(txid, queryMempool, function(err, tx) {
if (err) {
return callback(err);
}
return callback(null, tx);
});
return bitcoindjs.getTransaction(txid, queryMempool, callback);
};
Bitcoin.prototype.getTransactionWithBlock = function(txid, blockhash, callback) {

46
src/bitcoindjs.cc
View File

@ -804,39 +804,35 @@ async_get_tx(uv_work_t *req) {
uint256 blockhash;
CTransaction ctx;
{
if (data->queryMempool) {
LOCK(cs_main);
if (data->queryMempool) {
LOCK(cs_main);
{
if (mempool.lookup(hash, ctx))
{
if (mempool.lookup(hash, ctx))
{
return;
}
return;
}
}
}
CDiskTxPos postx;
if (pblocktree->ReadTxIndex(hash, postx)) {
CDiskTxPos postx;
if (pblocktree->ReadTxIndex(hash, postx)) {
CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
if (file.IsNull()) {
data->err_msg = std::string("%s: OpenBlockFile failed", __func__);
return;
}
if (file.IsNull()) {
data->err_msg = std::string("%s: OpenBlockFile failed", __func__);
return;
}
const int HEADER_SIZE = sizeof(int32_t) + sizeof(uint32_t) * 3 + sizeof(char) * 64;
try {
fseek(file.Get(), postx.nTxOffset + HEADER_SIZE, SEEK_CUR);
file >> ctx;
data->ctx = ctx;
} catch (const std::exception& e) {
data->err_msg = std::string("Deserialize or I/O error - %s", __func__);
return;
}
const int HEADER_SIZE = sizeof(int32_t) + sizeof(uint32_t) * 3 + sizeof(char) * 64;
try {
fseek(file.Get(), postx.nTxOffset + HEADER_SIZE, SEEK_CUR);
file >> ctx;
data->ctx = ctx;
} catch (const std::exception& e) {
data->err_msg = std::string("Deserialize or I/O error - %s", __func__);
return;
}
}