Fixed compilation. This does not immediately appear to derive from a …

…merge error, however
bancaditalia · Oct 11, 2023 · 8d01e3c · 8d01e3c
1 parent b3c731f
commit 8d01e3c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
@@ -203,7 +203,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
 
     BlockValidationState state;
     CheckBlockFn check_block = m_check_block_mock ? m_check_block_mock : CheckBlock;
-    if (!check_block(block, state, Params().GetConsensus(), /*fCheckPoW=*/true, /*fCheckMerkleRoot=*/true)) {
+    if (!check_block(block, state, Params().GetConsensus(), /*fCheckPoW=*/true, /*fCheckMerkleRoot=*/true, /*fCheckSignetSolution=*/true)) { // ITCOIN_SPECIFIC: added /*fCheckSignetSolution=*/true
         // TODO: We really want to just check merkle tree manually here,
         // but that is expensive, and CheckBlock caches a block's
         // "checked-status" (in the CBlock?). CBlock should be able to

diff --git a/src/blockencodings.h b/src/blockencodings.h
@@ -136,7 +136,7 @@ class PartiallyDownloadedBlock {
     CBlockHeader header;
 
     // Can be overridden for testing
-    using CheckBlockFn = std::function<bool(const CBlock&, BlockValidationState&, const Consensus::Params&, bool, bool)>;
+    using CheckBlockFn = std::function<bool(const CBlock&, BlockValidationState&, const Consensus::Params&, bool, bool, bool)>; // ITCOIN_SPECIFIC: added one more "bool" parameter to the signature, since validation.CheckBlock() in itcoin has an additional parameter fCheckSignetSolution
     CheckBlockFn m_check_block_mock{nullptr};
 
     explicit PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}

diff --git a/src/test/fuzz/partially_downloaded_block.cpp b/src/test/fuzz/partially_downloaded_block.cpp
@@ -31,7 +31,7 @@ void initialize_pdb()
 
 PartiallyDownloadedBlock::CheckBlockFn FuzzedCheckBlock(std::optional<BlockValidationResult> result)
 {
-    return [result](const CBlock&, BlockValidationState& state, const Consensus::Params&, bool, bool) {
+    return [result](const CBlock&, BlockValidationState& state, const Consensus::Params&, bool, bool, bool) { // ITCOIN_SPECIFIC: added one more "bool" parameter to the signature, since validation.CheckBlock() in itcoin has an additional parameter fCheckSignetSolution
         if (result) {
             return state.Invalid(*result);
         }