ReadBlockFromDisk definition not updated with nHeight parameter #120

New issue

Closed

opened 2024-11-20 10:11:02 +00:00 by MagicalTux · 0 comments

MagicalTux commented

2024-11-20 10:11:02 +00:00

(Migrated from github.com)

Fix:

diff '--color=auto' -bBrU3 monacoin-0.20.4.orig/src/test/util/blockfilter.cpp monacoin-0.20.4/src/test/util/blockfilter.cpp
--- monacoin-0.20.4.orig/src/test/util/blockfilter.cpp	2024-11-20 12:23:57.400568518 +0900
+++ monacoin-0.20.4/src/test/util/blockfilter.cpp	2024-11-20 19:04:55.970443425 +0900
@@ -11,7 +11,7 @@
 bool ComputeFilter(BlockFilterType filter_type, const CBlockIndex* block_index, BlockFilter& filter)
 {
     CBlock block;
-    if (!ReadBlockFromDisk(block, block_index->GetBlockPos(), Params().GetConsensus())) {
+    if (!ReadBlockFromDisk(block, block_index->GetBlockPos(), block_index->nHeight, Params().GetConsensus())) {
         return false;
     }
 
diff '--color=auto' -bBrU3 monacoin-0.20.4.orig/src/validation.h monacoin-0.20.4/src/validation.h
--- monacoin-0.20.4.orig/src/validation.h	2024-11-20 12:23:57.423902077 +0900
+++ monacoin-0.20.4/src/validation.h	2024-11-20 19:04:27.840150242 +0900
@@ -360,7 +360,7 @@
 
 
 /** Functions for disk access for blocks */
-bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, const Consensus::Params& consensusParams);
+bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, int nHeight, const Consensus::Params& consensusParams);
 bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus::Params& consensusParams);
 bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, const CMessageHeader::MessageStartChars& message_start);
 bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start);

in validation.cpp ReadBlockFromDisk was updated to include a nHeight parameter when taking a position in file, this was not updated in validation.h however causing issues when attempting to compile tests. Fix: ```patch diff '--color=auto' -bBrU3 monacoin-0.20.4.orig/src/test/util/blockfilter.cpp monacoin-0.20.4/src/test/util/blockfilter.cpp --- monacoin-0.20.4.orig/src/test/util/blockfilter.cpp 2024-11-20 12:23:57.400568518 +0900 +++ monacoin-0.20.4/src/test/util/blockfilter.cpp 2024-11-20 19:04:55.970443425 +0900 @@ -11,7 +11,7 @@ bool ComputeFilter(BlockFilterType filter_type, const CBlockIndex* block_index, BlockFilter& filter) { CBlock block; - if (!ReadBlockFromDisk(block, block_index->GetBlockPos(), Params().GetConsensus())) { + if (!ReadBlockFromDisk(block, block_index->GetBlockPos(), block_index->nHeight, Params().GetConsensus())) { return false; } diff '--color=auto' -bBrU3 monacoin-0.20.4.orig/src/validation.h monacoin-0.20.4/src/validation.h --- monacoin-0.20.4.orig/src/validation.h 2024-11-20 12:23:57.423902077 +0900 +++ monacoin-0.20.4/src/validation.h 2024-11-20 19:04:27.840150242 +0900 @@ -360,7 +360,7 @@ /** Functions for disk access for blocks */ -bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, const Consensus::Params& consensusParams); +bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, int nHeight, const Consensus::Params& consensusParams); bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus::Params& consensusParams); bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, const CMessageHeader::MessageStartChars& message_start); bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex, const CMessageHeader::MessageStartChars& message_start); ```