diff options
author | Pieter Wuille <pieter@wuille.net> | 2021-12-01 14:40:25 -0500 |
---|---|---|
committer | Pieter Wuille <pieter@wuille.net> | 2021-12-02 14:47:17 -0500 |
commit | 2c35a93b3cc19dc71d5664f9f61c24a04f419e35 (patch) | |
tree | 78a40228722d72de583ab39bbc932c186ec5fb39 /src/blockfilter.cpp | |
parent | 26a1147ce56083d7aa820ac115c16b01e47d911c (diff) | |
download | bitcoin-2c35a93b3cc19dc71d5664f9f61c24a04f419e35.tar.xz |
Generalize/simplify VectorReader into SpanReader
Diffstat (limited to 'src/blockfilter.cpp')
-rw-r--r-- | src/blockfilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp index 41fa0b6fa0..31a1e62d6b 100644 --- a/src/blockfilter.cpp +++ b/src/blockfilter.cpp @@ -81,7 +81,7 @@ GCSFilter::GCSFilter(const Params& params) GCSFilter::GCSFilter(const Params& params, std::vector<unsigned char> encoded_filter) : m_params(params), m_encoded(std::move(encoded_filter)) { - VectorReader stream(GCS_SER_TYPE, GCS_SER_VERSION, m_encoded, 0); + SpanReader stream{GCS_SER_TYPE, GCS_SER_VERSION, m_encoded, 0}; uint64_t N = ReadCompactSize(stream); m_N = static_cast<uint32_t>(N); @@ -92,7 +92,7 @@ GCSFilter::GCSFilter(const Params& params, std::vector<unsigned char> encoded_fi // Verify that the encoded filter contains exactly N elements. If it has too much or too little // data, a std::ios_base::failure exception will be raised. - BitStreamReader<VectorReader> bitreader(stream); + BitStreamReader<SpanReader> bitreader{stream}; for (uint64_t i = 0; i < m_N; ++i) { GolombRiceDecode(bitreader, m_params.m_P); } @@ -133,13 +133,13 @@ GCSFilter::GCSFilter(const Params& params, const ElementSet& elements) bool GCSFilter::MatchInternal(const uint64_t* element_hashes, size_t size) const { - VectorReader stream(GCS_SER_TYPE, GCS_SER_VERSION, m_encoded, 0); + SpanReader stream{GCS_SER_TYPE, GCS_SER_VERSION, m_encoded, 0}; // Seek forward by size of N uint64_t N = ReadCompactSize(stream); assert(N == m_N); - BitStreamReader<VectorReader> bitreader(stream); + BitStreamReader<SpanReader> bitreader{stream}; uint64_t value = 0; size_t hashes_index = 0; |