diff options
| author | Philip Kaufmann <[email protected]> | 2014-02-10 16:31:06 +0100 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2014-05-18 16:50:24 +0100 |
| commit | 3e0de4da6b5ab6711346ec01ff93fe49b61491ea (patch) | |
| tree | 95bbd13efd856f0a87e16c7680d66c76801d5478 /src/main.cpp | |
| parent | [Qt] Fix coin control qt5 checkbox bug in tree mode (diff) | |
| download | discoin-3e0de4da6b5ab6711346ec01ff93fe49b61491ea.tar.xz discoin-3e0de4da6b5ab6711346ec01ff93fe49b61491ea.zip | |
minor style cleanups
Conflicts:
src/main.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5b83a6d44..fa6ed2678 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1849,7 +1849,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C return state.DoS(100, error("ConnectBlock() : coinbase pays too much (actual=%d vs limit=%d)", block.vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees, prevHash)), - REJECT_INVALID, "bad-cb-amount"); + REJECT_INVALID, "bad-cb-amount"); if (!control.Wait()) return state.DoS(100, false); @@ -3277,14 +3277,14 @@ void static ProcessGetData(CNode* pfrom) int nHeight = mi->second->nHeight; CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex); if (pcheckpoint && nHeight < pcheckpoint->nHeight) { - if (!chainActive.Contains(mi->second)) - { - LogPrintf("ProcessGetData(): ignoring request for old block that isn't in the main chain\n"); - } else { - send = true; - } + if (!chainActive.Contains(mi->second)) + { + LogPrintf("ProcessGetData(): ignoring request for old block that isn't in the main chain\n"); + } else { + send = true; + } } else { - send = true; + send = true; } } if (send) @@ -3804,7 +3804,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } int nDoS = 0; if (state.IsInvalid(nDoS)) - { + { LogPrint("mempool", "%s from %s %s was not accepted into the memory pool: %s\n", tx.GetHash().ToString(), pfrom->addr.ToString(), pfrom->cleanSubVer, state.GetRejectReason()); |