From 1c615ac7c00063a9c0510126421fb241dbf26a73 Mon Sep 17 00:00:00 2001 From: Chris Kleeschulte Date: Wed, 15 Jul 2015 18:52:36 -0400 Subject: [PATCH] Added extern mempool and fixed method name. --- integration/index.js | 6 +++--- src/bitcoindjs.cc | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/integration/index.js b/integration/index.js index 3e2b12f2..14da0300 100644 --- a/integration/index.js +++ b/integration/index.js @@ -64,15 +64,15 @@ describe('Basic Functionality', function() { describe.only('determine if outpoint is unspent/spent', function() { spentData.forEach(function(data) { - it('for txid ' + data.txid + ' and output ' + data.outputIndex, function() { + it('for spent txid ' + data.txid + ' and output ' + data.outputIndex, function() { var spent = bitcoind.isSpent(data.txid, data.outputIndex, true); spent.should.equal(true); }); }); unspentData.forEach(function(data) { - it('for txid ' + data.txid + ' and output ' + data.outputIndex, function() { - var spent = bitcoind.isSapent(data.txid, data.outputIndex, true); + it('for unspent txid ' + data.txid + ' and output ' + data.outputIndex, function() { + var spent = bitcoind.isSpent(data.txid, data.outputIndex, true); spent.should.equal(false); }); }); diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index cbf6870f..b77bdb78 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -22,6 +22,7 @@ using namespace v8; extern void WaitForShutdown(boost::thread_group* threadGroup); static termios orig_termios; +extern CTxMemPool mempool; /** * Node.js Internal Function Templates @@ -951,19 +952,19 @@ NAN_METHOD(IsSpent) { int outputIndex = args[1]->IntegerValue(); bool queryMempool = args[2]->BooleanValue(); - CCoinsViewCache &view = *pcoinsTip; + CCoinsView dummy; + CCoinsViewCache view(&dummy); + + CCoinsViewMemPool viewMemPool(pcoinsTip, mempool); + view.SetBackend(viewMemPool); if (view.HaveCoins(txid)) { const CCoins* coins = view.AccessCoins(txid); - if (!coins || !coins->IsAvailable(outputIndex)) { + if (coins && coins->IsAvailable(outputIndex)) { NanReturnValue(NanNew(false)); return; } - } else { - NanReturnValue(NanNew(false)); - return; } - NanReturnValue(NanNew(true)); };