diff options
| author | Jeff Garzik <[email protected]> | 2012-05-11 07:53:08 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2012-05-11 07:53:08 -0700 |
| commit | 271f9faf9e18b8e17eee6fa61b84663115863e74 (patch) | |
| tree | 2be8e4565ed018f51f0bdef7cccfba55fc37d310 /src/main.cpp | |
| parent | Merge pull request #1258 from Diapolo/RPCCon_never_0_Blocks (diff) | |
| parent | CTxMemPool::accept(): do not log FetchInputs failure redundantly (diff) | |
| download | discoin-271f9faf9e18b8e17eee6fa61b84663115863e74.tar.xz discoin-271f9faf9e18b8e17eee6fa61b84663115863e74.zip | |
Merge pull request #1254 from jgarzik/mempool-logging
CTxMemPool: consolidate two frequently-printed debug.log lines into one
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index b0ed28aa1..98f9b71ef 100644 --- 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. { |