remove internal tracking of mempool conflicts for reporting to wallet
This commit is contained in:
parent
bf663f8e93
commit
a874ab5ccf
4 changed files with 29 additions and 32 deletions
|
@ -80,9 +80,9 @@ BOOST_AUTO_TEST_CASE(SimpleRoundTripTest)
|
|||
|
||||
BOOST_CHECK_EQUAL(pool.mapTx.find(block.vtx[2]->GetHash())->GetSharedTx().use_count(), SHARED_TX_OFFSET + 1);
|
||||
|
||||
std::vector<CTransactionRef> removed;
|
||||
pool.removeRecursive(*block.vtx[2], &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 1);
|
||||
size_t poolSize = pool.size();
|
||||
pool.removeRecursive(*block.vtx[2]);
|
||||
BOOST_CHECK_EQUAL(pool.size(), poolSize - 1);
|
||||
|
||||
CBlock block2;
|
||||
std::vector<CTransactionRef> vtx_missing;
|
||||
|
|
|
@ -55,17 +55,17 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
|
|||
|
||||
|
||||
CTxMemPool testPool(CFeeRate(0));
|
||||
std::vector<CTransactionRef> removed;
|
||||
|
||||
// Nothing in pool, remove should do nothing:
|
||||
testPool.removeRecursive(txParent, &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 0);
|
||||
unsigned int poolSize = testPool.size();
|
||||
testPool.removeRecursive(txParent);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize);
|
||||
|
||||
// Just the parent:
|
||||
testPool.addUnchecked(txParent.GetHash(), entry.FromTx(txParent));
|
||||
testPool.removeRecursive(txParent, &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 1);
|
||||
removed.clear();
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txParent);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize - 1);
|
||||
|
||||
// Parent, children, grandchildren:
|
||||
testPool.addUnchecked(txParent.GetHash(), entry.FromTx(txParent));
|
||||
|
@ -75,19 +75,21 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
|
|||
testPool.addUnchecked(txGrandChild[i].GetHash(), entry.FromTx(txGrandChild[i]));
|
||||
}
|
||||
// Remove Child[0], GrandChild[0] should be removed:
|
||||
testPool.removeRecursive(txChild[0], &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 2);
|
||||
removed.clear();
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txChild[0]);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize - 2);
|
||||
// ... make sure grandchild and child are gone:
|
||||
testPool.removeRecursive(txGrandChild[0], &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 0);
|
||||
testPool.removeRecursive(txChild[0], &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 0);
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txGrandChild[0]);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize);
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txChild[0]);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize);
|
||||
// Remove parent, all children/grandchildren should go:
|
||||
testPool.removeRecursive(txParent, &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 5);
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txParent);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize - 5);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), 0);
|
||||
removed.clear();
|
||||
|
||||
// Add children and grandchildren, but NOT the parent (simulate the parent being in a block)
|
||||
for (int i = 0; i < 3; i++)
|
||||
|
@ -97,10 +99,10 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
|
|||
}
|
||||
// Now remove the parent, as might happen if a block-re-org occurs but the parent cannot be
|
||||
// put into the mempool (maybe because it is non-standard):
|
||||
testPool.removeRecursive(txParent, &removed);
|
||||
BOOST_CHECK_EQUAL(removed.size(), 6);
|
||||
poolSize = testPool.size();
|
||||
testPool.removeRecursive(txParent);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), poolSize - 6);
|
||||
BOOST_CHECK_EQUAL(testPool.size(), 0);
|
||||
removed.clear();
|
||||
}
|
||||
|
||||
template<typename name>
|
||||
|
|
|
@ -503,7 +503,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
|
|||
}
|
||||
}
|
||||
|
||||
void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<CTransactionRef>* removed)
|
||||
void CTxMemPool::removeRecursive(const CTransaction &origTx)
|
||||
{
|
||||
// Remove transaction from memory pool
|
||||
{
|
||||
|
@ -530,11 +530,6 @@ void CTxMemPool::removeRecursive(const CTransaction &origTx, std::vector<CTransa
|
|||
BOOST_FOREACH(txiter it, txToRemove) {
|
||||
CalculateDescendants(it, setAllRemoves);
|
||||
}
|
||||
if (removed) {
|
||||
BOOST_FOREACH(txiter it, setAllRemoves) {
|
||||
removed->emplace_back(it->GetSharedTx());
|
||||
}
|
||||
}
|
||||
RemoveStaged(setAllRemoves, false);
|
||||
}
|
||||
}
|
||||
|
@ -576,7 +571,7 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem
|
|||
RemoveStaged(setAllRemoves, false);
|
||||
}
|
||||
|
||||
void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed)
|
||||
void CTxMemPool::removeConflicts(const CTransaction &tx)
|
||||
{
|
||||
// Remove transactions which depend on inputs of tx, recursively
|
||||
LOCK(cs);
|
||||
|
@ -586,7 +581,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::vector<CTransactio
|
|||
const CTransaction &txConflict = *it->second;
|
||||
if (txConflict != tx)
|
||||
{
|
||||
removeRecursive(txConflict, removed);
|
||||
removeRecursive(txConflict);
|
||||
ClearPrioritisation(txConflict.GetHash());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -527,9 +527,9 @@ public:
|
|||
bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, bool fCurrentEstimate = true);
|
||||
bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
|
||||
|
||||
void removeRecursive(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
|
||||
void removeRecursive(const CTransaction &tx);
|
||||
void removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight, int flags);
|
||||
void removeConflicts(const CTransaction &tx, std::vector<CTransactionRef>* removed = NULL);
|
||||
void removeConflicts(const CTransaction &tx);
|
||||
void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
|
||||
bool fCurrentEstimate = true);
|
||||
void clear();
|
||||
|
|
Loading…
Reference in a new issue