diff options
| author | Gavin Andresen <[email protected]> | 2013-10-27 22:42:44 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-10-27 22:42:44 -0700 |
| commit | cd1fc2434ce80f50242e41b5e675f6d0b36045ad (patch) | |
| tree | e0729ec1713fa42a00d14c2fb41c201fa09ec7c9 /src/main.cpp | |
| parent | Merge pull request #3158 from Diapolo/guiutil (diff) | |
| parent | pull-tester.py: Re-enable coverage msg, new args to run test script (diff) | |
| download | discoin-cd1fc2434ce80f50242e41b5e675f6d0b36045ad.tar.xz discoin-cd1fc2434ce80f50242e41b5e675f6d0b36045ad.zip | |
Merge pull request #3164 from TheBlueMatt/master
Re-enable BitcoindComparisonTool on pull-tester
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6ffbc5a44..56bd7a5cf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2355,7 +2355,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo uniqueTx.insert(block.GetTxHash(i)); } if (uniqueTx.size() != block.vtx.size()) - return state.DoS(100, error("CheckBlock() : duplicate transaction")); + return state.DoS(100, error("CheckBlock() : duplicate transaction"), true); unsigned int nSigOps = 0; BOOST_FOREACH(const CTransaction& tx, block.vtx) @@ -3783,7 +3783,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) LOCK(cs_main); CValidationState state; - if (ProcessBlock(state, pfrom, &block)) + if (ProcessBlock(state, pfrom, &block) || state.CorruptionPossible()) mapAlreadyAskedFor.erase(inv); int nDoS = 0; if (state.IsInvalid(nDoS)) |