Merge pull request #1254 from jgarzik/mempool-logging

Jeff Garzik · Jeff Garzik · commit 271f9faf9e18 · 2012-05-11T07:53:08.000-07:00
CTxMemPool: consolidate two frequently-printed debug.log lines into one
diff --git a/src/main.cpp b/src/main.cpp
@@ -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());
             if (pfMissingInputs)
                 *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
@@ -594,7 +594,9 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
     if (ptxOld)
         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;
 }
 
@@ -605,7 +607,6 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
 
 bool CTxMemPool::addUnchecked(CTransaction &tx)
 {
-    printf("addUnchecked(): size %lu\n",  mapTx.size());
     // Add to memory pool without checking anything.  Don't call this directly,
     // call CTxMemPool::accept to properly check the transaction first.
     {

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,`
`527`	`527`	`return error("CTxMemPool::accept() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str());`
`528`	`528`	`if (pfMissingInputs)`
`529`	`529`	`*pfMissingInputs = true;`
`530`		`- return error("CTxMemPool::accept() : FetchInputs failed %s", hash.ToString().substr(0,10).c_str());`
	`530`	`+ return false;`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`// Check for non-standard pay-to-script-hash in inputs`
`@@ -594,7 +594,9 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,`
`594`	`594`	`if (ptxOld)`
`595`	`595`	`EraseFromWallets(ptxOld->GetHash());`
`596`	`596`
`597`		`- printf("CTxMemPool::accept() : accepted %s\n", hash.ToString().substr(0,10).c_str());`
	`597`	`+ printf("CTxMemPool::accept() : accepted %s (poolsz %u)\n",`
	`598`	`+ hash.ToString().substr(0,10).c_str(),`
	`599`	`+ mapTx.size());`
`598`	`600`	`return true;`
`599`	`601`	`}`
`600`	`602`
`@@ -605,7 +607,6 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi`
`605`	`607`
`606`	`608`	`bool CTxMemPool::addUnchecked(CTransaction &tx)`
`607`	`609`	`{`
`608`		`- printf("addUnchecked(): size %lu\n", mapTx.size());`
`609`	`610`	`// Add to memory pool without checking anything. Don't call this directly,`
`610`	`611`	`// call CTxMemPool::accept to properly check the transaction first.`
`611`	`612`	`{`