diff --git a/src/hash.h b/src/hash.h index 7c9b3fa06d..f2b627ff4f 100644 --- a/src/hash.h +++ b/src/hash.h @@ -199,39 +199,6 @@ public: } }; -template -class CHashVerifier : public CHashWriter -{ -private: - Source* source; - -public: - explicit CHashVerifier(Source* source_) : CHashWriter(source_->GetType(), source_->GetVersion()), source(source_) {} - - void read(Span dst) - { - source->read(dst); - this->write(dst); - } - - void ignore(size_t nSize) - { - std::byte data[1024]; - while (nSize > 0) { - size_t now = std::min(nSize, 1024); - read({data, now}); - nSize -= now; - } - } - - template - CHashVerifier& operator>>(T&& obj) - { - ::Unserialize(*this, obj); - return (*this); - } -}; - /** Writes data to an underlying source stream, while hashing the written data. */ template class HashedSourceWriter : public HashWriter diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp index 5232175824..589a2fd766 100644 --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -553,12 +553,12 @@ BOOST_AUTO_TEST_CASE(streams_buffered_file_rand) BOOST_AUTO_TEST_CASE(streams_hashed) { - CDataStream stream(SER_NETWORK, INIT_PROTO_VERSION); + DataStream stream{}; HashedSourceWriter hash_writer{stream}; const std::string data{"bitcoin"}; hash_writer << data; - CHashVerifier hash_verifier{&stream}; + HashVerifier hash_verifier{stream}; std::string result; hash_verifier >> result; BOOST_CHECK_EQUAL(data, result);