validation: Proper validation state set for "out of order" check in CheckBlock.

furszy · furszy · commit 22b17577b313 · 2021-07-21T17:28:25.000-03:00
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
@@ -143,10 +143,10 @@ BOOST_AUTO_TEST_CASE(processnewblock_signals_ordering)
                 if (block->vtx.size() == 1) {
                     bool processed = ProcessNewBlock(state, block, nullptr);
                     // Future to do: "prevblk-not-found" here is the only valid reason to not check processed flag.
-                    if (state.GetRejectReason() == "duplicate" ||
-                        state.GetRejectReason() == "prevblk-not-found" ||
-                        state.GetRejectReason() == "bad-prevblk") continue;
-                    ASSERT_WITH_MSG(!processed,  ("Error: " + state.GetRejectReason()).c_str());
+                    std::string stateReason = state.GetRejectReason();
+                    if (stateReason == "duplicate" || stateReason == "prevblk-not-found" ||
+                        stateReason == "bad-prevblk" || stateReason == "blk-out-of-order") continue;
+                    ASSERT_WITH_MSG(processed,  ("Error: " + state.GetRejectReason()).c_str());
                 }
             }
         });
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2759,7 +2759,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
             //out of order
             auto mi = mapBlockIndex.find(block.hashPrevBlock);
             if (mi == mapBlockIndex.end()) {
-                return false;
+                return state.Error("blk-out-of-order");
             }
             pindexPrev = mi->second;
         }

Original file line number	Diff line number	Diff line change
`@@ -2759,7 +2759,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo`
`2759`	`2759`	`//out of order`
`2760`	`2760`	`auto mi = mapBlockIndex.find(block.hashPrevBlock);`
`2761`	`2761`	`if (mi == mapBlockIndex.end()) {`
`2762`		`- return false;`
	`2762`	`+ return state.Error("blk-out-of-order");`
`2763`	`2763`	`}`
`2764`	`2764`	`pindexPrev = mi->second;`
`2765`	`2765`	`}`