diff --git a/lib/bitcoind.js b/lib/bitcoind.js index e7da81ec..4fbb5588 100644 --- a/lib/bitcoind.js +++ b/lib/bitcoind.js @@ -379,7 +379,7 @@ Bitcoin.prototype.getTx = function(txHash, blockHash, callback) { blockHash = ''; } } - return bitcoindjs.getTx(txHash, blockHash, function(err, tx) { + return bitcoindjs.getTransaction(txHash, blockHash, function(err, tx) { if (err) return callback(err); return callback(null, bitcoin.tx(tx)); }); @@ -888,7 +888,7 @@ Wallet.prototype.getTransactions = function(options, callback) { // Retrieve to regular TXs from disk: var out = []; return utils.forEach(txs, function(tx, next) { - return bitcoindjs.getTx(tx.txid, tx.blockhash, function(err, tx_) { + return bitcoindjs.getTransaction(tx.txid, tx.blockhash, function(err, tx_) { if (err) return next(err); var tx = bitcoin.tx(tx_); tx._walletTransaction = tx_; @@ -918,7 +918,7 @@ Wallet.prototype.getTransaction = function(options, callback) { var tx = bitcoindjs.walletGetTransaction(options || {}); if (callback) { // Retrieve to regular TX from disk: - return bitcoindjs.getTx(tx.txid, tx.blockhash, function(err, tx_) { + return bitcoindjs.getTransaction(tx.txid, tx.blockhash, function(err, tx_) { if (err) return next(err); var tx = bitcoin.tx(tx_); tx._walletTransaction = tx_; diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index cb9f0b2e..54bfa63d 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -198,7 +198,7 @@ NAN_METHOD(IsStopping); NAN_METHOD(IsStopped); NAN_METHOD(StopBitcoind); NAN_METHOD(GetBlock); -NAN_METHOD(GetTx); +NAN_METHOD(GetTransaction); NAN_METHOD(BroadcastTx); NAN_METHOD(VerifyBlock); NAN_METHOD(VerifyTransaction); @@ -1050,12 +1050,12 @@ async_get_block_after(uv_work_t *req) { } /** - * GetTx() + * GetTransaction() * bitcoind.getTx(txHash, [blockHash], callback) * Read any transaction from disk asynchronously. */ -NAN_METHOD(GetTx) { +NAN_METHOD(GetTransaction) { NanScope(); if (args.Length() < 3 @@ -6082,7 +6082,7 @@ init(Handle target) { NODE_SET_METHOD(target, "stopping", IsStopping); NODE_SET_METHOD(target, "stopped", IsStopped); NODE_SET_METHOD(target, "getBlock", GetBlock); - NODE_SET_METHOD(target, "getTx", GetTx); + NODE_SET_METHOD(target, "getTx", GetTransaction); NODE_SET_METHOD(target, "broadcastTx", BroadcastTx); NODE_SET_METHOD(target, "verifyBlock", VerifyBlock); NODE_SET_METHOD(target, "verifyTransaction", VerifyTransaction);