mirror of
https://github.com/twisterarmy/twister-core.git
synced 2025-01-13 08:17:52 +00:00
Merge pull request #1254 from jgarzik/mempool-logging
CTxMemPool: consolidate two frequently-printed debug.log lines into one
This commit is contained in:
commit
271f9faf9e
@ -527,7 +527,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
|
|||||||
return error("CTxMemPool::accept() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str());
|
return error("CTxMemPool::accept() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str());
|
||||||
if (pfMissingInputs)
|
if (pfMissingInputs)
|
||||||
*pfMissingInputs = true;
|
*pfMissingInputs = true;
|
||||||
return error("CTxMemPool::accept() : FetchInputs failed %s", hash.ToString().substr(0,10).c_str());
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for non-standard pay-to-script-hash in inputs
|
// Check for non-standard pay-to-script-hash in inputs
|
||||||
@ -594,7 +594,9 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
|
|||||||
if (ptxOld)
|
if (ptxOld)
|
||||||
EraseFromWallets(ptxOld->GetHash());
|
EraseFromWallets(ptxOld->GetHash());
|
||||||
|
|
||||||
printf("CTxMemPool::accept() : accepted %s\n", hash.ToString().substr(0,10).c_str());
|
printf("CTxMemPool::accept() : accepted %s (poolsz %u)\n",
|
||||||
|
hash.ToString().substr(0,10).c_str(),
|
||||||
|
mapTx.size());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -605,7 +607,6 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
|
|||||||
|
|
||||||
bool CTxMemPool::addUnchecked(CTransaction &tx)
|
bool CTxMemPool::addUnchecked(CTransaction &tx)
|
||||||
{
|
{
|
||||||
printf("addUnchecked(): size %lu\n", mapTx.size());
|
|
||||||
// Add to memory pool without checking anything. Don't call this directly,
|
// Add to memory pool without checking anything. Don't call this directly,
|
||||||
// call CTxMemPool::accept to properly check the transaction first.
|
// call CTxMemPool::accept to properly check the transaction first.
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user