hex_reader complete, fixes and tests.

Author: evoskuil

include/bitcoin/system/impl/stream/streamers/hex_reader.ipp

@@ -52,18 +52,13 @@ hex_reader<IStream>::hex_reader(IStream& source,
 
 // protected
 // ----------------------------------------------------------------------------
-// Overide all seek/read operations.
+// Overide all seek/read/limit operations.
 
 template <typename IStream>
 void hex_reader<IStream>::do_read_bytes(uint8_t* buffer,
     size_t size) NOEXCEPT
 {
     BC_ASSERT(!is_null(buffer));
-    if (!is_even(size))
-    {
-        this->invalidate();
-        return;
-    }
 
     // Scale for hex pairs and check limit.
     if (is_multiply_overflow(size, octet_width) ||
@@ -127,9 +122,22 @@ void hex_reader<IStream>::do_rewind_bytes(size_t size) NOEXCEPT
 template <typename IStream>
 size_t hex_reader<IStream>::get_read_position() NOEXCEPT
 {
+    // Position continues to represent logical bytes, so can be differenced.
     return base::get_read_position() / octet_width;
 }
 
+template <typename IStream>
+void hex_reader<IStream>::set_limit(size_t size) NOEXCEPT
+{
+    if (is_multiply_overflow(size, octet_width))
+    {
+        this->invalidate();
+        return;
+    }
+
+    base::set_limit(size * octet_width);
+}
+
 } // namespace system
 } // namespace libbitcoin
 

include/bitcoin/system/stream/streamers/hex_reader.hpp

@@ -50,6 +50,7 @@ class hex_reader
     uint8_t do_peek_byte() NOEXCEPT override;
 
     /// Overide all seek operations.
+    void set_limit(size_t size) NOEXCEPT override;
     void do_skip_bytes(size_t size) NOEXCEPT override;
     void do_rewind_bytes(size_t size) NOEXCEPT override;
     size_t get_read_position() NOEXCEPT override;

test/stream/streamers/hex_reader.cpp

@@ -72,4 +72,42 @@ BOOST_AUTO_TEST_CASE(hex_reader__copy__genesis_header__expected)
     BOOST_REQUIRE(header == genesis().header());
 }
 
+// verify seek using full tx parse (scripts use position/skip/rewind/peek).
+
+static const data_slice hex
+{
+    "0100000000000000000000000000000000000000000000000000000000000000"
+    "000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa"
+    "4b1e5e4a29ab5f49ffff001d1dac2b7c01010000000100000000000000000000"
+    "00000000000000000000000000000000000000000000ffffffff4d04ffff001d"
+    "0104455468652054696d65732030332f4a616e2f32303039204368616e63656c"
+    "6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f75742066"
+    "6f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe554827"
+    "1967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4"
+    "f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000"
+};
+
+BOOST_AUTO_TEST_CASE(hex_reader__fast_stream__genesis_block__expected)
+{
+    stream::in::fast source{ hex };
+    read::base16::fast hexer{ source };
+    const chain::block block{ hexer, true };
+    BOOST_REQUIRE(block == genesis());
+}
+
+BOOST_AUTO_TEST_CASE(hex_reader__copy_stream__genesis_block__expected)
+{
+    read::base16::copy hexer{ hex };
+    const chain::block block{ hexer, true };
+    BOOST_REQUIRE(block == genesis());
+}
+
+BOOST_AUTO_TEST_CASE(hex_reader__istream_stream__genesis_block__expected)
+{
+    std::istringstream stream{ hex.to_string() };
+    read::base16::istream hexer{ stream };
+    const chain::block block{ hexer, true };
+    BOOST_REQUIRE(block == genesis());
+}
+
 BOOST_AUTO_TEST_SUITE_END()