Merge pull request #1446 from evoskuil/master

evoskuil · web-flow · commit 82d5d4c44065 · 2024-05-01T02:48:25.000-04:00
Fix parameter name.
diff --git a/include/bitcoin/system/wallet/neutrino_filter.hpp b/include/bitcoin/system/wallet/neutrino_filter.hpp
@@ -42,7 +42,7 @@ struct BC_API block_filter
 bool BC_API compute_filter(data_chunk& out,
     const chain::block& block) NOEXCEPT;
 
-hash_digest BC_API compute_filter_header(const hash_digest& previous_block,
+hash_digest BC_API compute_filter_header(const hash_digest& previous_header,
     const data_chunk& filter) NOEXCEPT;
 
 bool BC_API match_filter(const block_filter& filter,
diff --git a/src/wallet/neutrino_filter.cpp b/src/wallet/neutrino_filter.cpp
@@ -41,7 +41,7 @@ bool compute_filter(data_chunk& out, const chain::block& block) NOEXCEPT
 {
     const auto hash = block.hash();
     const auto key = to_siphash_key(slice<zero, to_half(hash_size)>(hash));
-    data_stack scripts;
+    data_stack scripts{};
 
     for (const auto& tx: *block.transactions_ptr())
     {
@@ -89,10 +89,10 @@ bool compute_filter(data_chunk& out, const chain::block& block) NOEXCEPT
     return true;
 }
 
-hash_digest compute_filter_header(const hash_digest& previous_block_hash,
+hash_digest compute_filter_header(const hash_digest& previous_header,
     const data_chunk& filter) NOEXCEPT
 {
-    return bitcoin_hash(splice(bitcoin_hash(filter), previous_block_hash));
+    return bitcoin_hash(splice(bitcoin_hash(filter), previous_header));
 }
 
 bool match_filter(const block_filter& filter,

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ bool compute_filter(data_chunk& out, const chain::block& block) NOEXCEPT`
`41`	`41`	`{`
`42`	`42`	`const auto hash = block.hash();`
`43`	`43`	`const auto key = to_siphash_key(slice<zero, to_half(hash_size)>(hash));`
`44`		`- data_stack scripts;`
	`44`	`+ data_stack scripts{};`
`45`	`45`
`46`	`46`	`for (const auto& tx: *block.transactions_ptr())`
`47`	`47`	`{`
`@@ -89,10 +89,10 @@ bool compute_filter(data_chunk& out, const chain::block& block) NOEXCEPT`
`89`	`89`	`return true;`
`90`	`90`	`}`
`91`	`91`
`92`		`-hash_digest compute_filter_header(const hash_digest& previous_block_hash,`
	`92`	`+hash_digest compute_filter_header(const hash_digest& previous_header,`
`93`	`93`	`const data_chunk& filter) NOEXCEPT`
`94`	`94`	`{`
`95`		`- return bitcoin_hash(splice(bitcoin_hash(filter), previous_block_hash));`
	`95`	`+ return bitcoin_hash(splice(bitcoin_hash(filter), previous_header));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`bool match_filter(const block_filter& filter,`