From 8d01e3c7514a7d4b2d646230141f6e97b4f8e0a3 Mon Sep 17 00:00:00 2001 From: muxator Date: Wed, 11 Oct 2023 14:11:32 +0200 Subject: [PATCH] Fixed compilation. This does not immediately appear to derive from a merge error, however --- src/blockencodings.cpp | 2 +- src/blockencodings.h | 2 +- src/test/fuzz/partially_downloaded_block.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index a29e4f794e9011..32659f412b9ec4 100644 --- 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 index afdfa426f194b2..cb1115b61f7e25 100644 --- 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; + using CheckBlockFn = std::function; // 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 index f8ba4f08d9a054..1d47bee72fe464 100644 --- 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 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); }