Merge pull request libbitcoin#1361 from evoskuil/master

Implementation and test of simple streams.
xraid · May 2, 2023 · 3f0b80d · 3f0b80d
2 parents f112434 + 59f6cf3
commit 3f0b80d
Show file tree

Hide file tree

Showing 22 changed files with 1,150 additions and 31 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -343,6 +343,9 @@ test_libbitcoin_system_test_SOURCES = \
     test/stream/devices/copy_source.cpp \
     test/stream/devices/flip_sink.cpp \
     test/stream/devices/push_sink.cpp \
+    test/stream/simple/iostream.cpp \
+    test/stream/simple/istream.cpp \
+    test/stream/simple/ostream.cpp \
     test/stream/streamers/bit_flipper.cpp \
     test/stream/streamers/bit_reader.cpp \
     test/stream/streamers/bit_writer.cpp \
@@ -644,6 +647,11 @@ include_bitcoin_system_impl_streamdir = ${includedir}/bitcoin/system/impl/stream
 include_bitcoin_system_impl_stream_HEADERS = \
     include/bitcoin/system/impl/stream/device.ipp
 
+include_bitcoin_system_impl_stream_simpledir = ${includedir}/bitcoin/system/impl/stream/simple
+include_bitcoin_system_impl_stream_simple_HEADERS = \
+    include/bitcoin/system/impl/stream/simple/istream.ipp \
+    include/bitcoin/system/impl/stream/simple/ostream.ipp
+
 include_bitcoin_system_impl_stream_streamersdir = ${includedir}/bitcoin/system/impl/stream/streamers
 include_bitcoin_system_impl_stream_streamers_HEADERS = \
     include/bitcoin/system/impl/stream/streamers/bit_reader.ipp \
@@ -747,6 +755,12 @@ include_bitcoin_system_stream_devices_HEADERS = \
     include/bitcoin/system/stream/devices/flip_sink.hpp \
     include/bitcoin/system/stream/devices/push_sink.hpp
 
+include_bitcoin_system_stream_simpledir = ${includedir}/bitcoin/system/stream/simple
+include_bitcoin_system_stream_simple_HEADERS = \
+    include/bitcoin/system/stream/simple/iostream.hpp \
+    include/bitcoin/system/stream/simple/istream.hpp \
+    include/bitcoin/system/stream/simple/ostream.hpp
+
 include_bitcoin_system_stream_streamersdir = ${includedir}/bitcoin/system/stream/streamers
 include_bitcoin_system_stream_streamers_HEADERS = \
     include/bitcoin/system/stream/streamers/bit_flipper.hpp \

diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -817,6 +817,9 @@ if (with-tests)
         "../../test/stream/devices/copy_source.cpp"
         "../../test/stream/devices/flip_sink.cpp"
         "../../test/stream/devices/push_sink.cpp"
+        "../../test/stream/simple/iostream.cpp"
+        "../../test/stream/simple/istream.cpp"
+        "../../test/stream/simple/ostream.cpp"
         "../../test/stream/streamers/bit_flipper.cpp"
         "../../test/stream/streamers/bit_reader.cpp"
         "../../test/stream/streamers/bit_writer.cpp"

diff --git a/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj b/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj
@@ -211,6 +211,9 @@
     <ClCompile Include="..\..\..\..\test\stream\devices\copy_source.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\devices\flip_sink.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\devices\push_sink.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\simple\iostream.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\simple\istream.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\simple\ostream.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\stream.cpp">
       <ObjectFileName>$(IntDir)test_stream_stream.obj</ObjectFileName>
     </ClCompile>
@@ -343,6 +346,11 @@
     <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets'))" />
   </Target>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'">
+    <PostBuildEvent>
+      <Command>"$(TargetPath)" --run_test=istream_tests --show_progress=no --build_info=yes</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\libbitcoin-system\libbitcoin-system.vcxproj">
       <Project>{39F60708-FF48-4C22-952D-43470866F684}</Project>
@@ -351,4 +359,4 @@
   <ItemGroup>
     <Natvis Include="..\..\debug.natvis" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj.filters
@@ -73,32 +73,35 @@
     <Filter Include="src\stream\devices">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\stream\streamers">
+    <Filter Include="src\stream\simple">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000010}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\stream\streamers">
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\unicode">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000E}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\unicode\utf8_everywhere">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000F}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\addresses">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\keys">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\mnemonics">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\words">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000001}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\words\catalogs">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000F1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -465,6 +468,15 @@
     <ClCompile Include="..\..\..\..\test\stream\devices\push_sink.cpp">
       <Filter>src\stream\devices</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\stream\simple\iostream.cpp">
+      <Filter>src\stream\simple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\stream\simple\istream.cpp">
+      <Filter>src\stream\simple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\stream\simple\ostream.cpp">
+      <Filter>src\stream\simple</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\stream\stream.cpp">
       <Filter>src\stream</Filter>
     </ClCompile>

diff --git a/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj b/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj
@@ -409,6 +409,9 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\devices\push_sink.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_stream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_streamer.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\iostream.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\istream.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\ostream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream_result.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\streamers.hpp" />
@@ -556,6 +559,8 @@
     <None Include="..\..\..\..\include\bitcoin\system\impl\serial\deserialize.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\serial\serialize.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\device.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\istream.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\ostream.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_reader.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_writer.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\byte_reader.ipp" />

diff --git a/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj.filters
@@ -82,14 +82,17 @@
     <Filter Include="include\bitcoin\system\impl\stream">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\bitcoin\system\impl\stream\streamers">
+    <Filter Include="include\bitcoin\system\impl\stream\simple">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000C3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="include\bitcoin\system\impl\stream\streamers">
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000D3}</UniqueIdentifier>
+    </Filter>
     <Filter Include="include\bitcoin\system\impl\wallet">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\impl\wallet\addresses">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000D3}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000E3}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\impl\words">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000012}</UniqueIdentifier>
@@ -98,10 +101,10 @@
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000005}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\intrinsics\arm">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000E3}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000F3}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\intrinsics\xcpu">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000F3}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000004}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\machine">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000006}</UniqueIdentifier>
@@ -119,40 +122,43 @@
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\stream\devices">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000004}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000005}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\bitcoin\system\stream\simple">
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000006}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\stream\streamers">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000005}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000007}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\stream\streamers\interfaces">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000006}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000008}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\unicode">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\unicode\utf8_everywhere">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000007}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000009}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000A2}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\addresses">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000008}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\keys">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000009}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\mnemonics">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000012}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\words">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\words\catalogs">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000013}</UniqueIdentifier>
     </Filter>
     <Filter Include="resource">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000012}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000A4}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000000}</UniqueIdentifier>
@@ -1100,6 +1106,15 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_streamer.hpp">
       <Filter>include\bitcoin\system\stream</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\iostream.hpp">
+      <Filter>include\bitcoin\system\stream\simple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\istream.hpp">
+      <Filter>include\bitcoin\system\stream\simple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\ostream.hpp">
+      <Filter>include\bitcoin\system\stream\simple</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream.hpp">
       <Filter>include\bitcoin\system\stream</Filter>
     </ClInclude>
@@ -1537,6 +1552,12 @@
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\device.ipp">
       <Filter>include\bitcoin\system\impl\stream</Filter>
     </None>
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\istream.ipp">
+      <Filter>include\bitcoin\system\impl\stream\simple</Filter>
+    </None>
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\ostream.ipp">
+      <Filter>include\bitcoin\system\impl\stream\simple</Filter>
+    </None>
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_reader.ipp">
       <Filter>include\bitcoin\system\impl\stream\streamers</Filter>
     </None>

diff --git a/include/bitcoin/system.hpp b/include/bitcoin/system.hpp
@@ -187,6 +187,9 @@
 #include <bitcoin/system/stream/devices/copy_source.hpp>
 #include <bitcoin/system/stream/devices/flip_sink.hpp>
 #include <bitcoin/system/stream/devices/push_sink.hpp>
+#include <bitcoin/system/stream/simple/iostream.hpp>
+#include <bitcoin/system/stream/simple/istream.hpp>
+#include <bitcoin/system/stream/simple/ostream.hpp>
 #include <bitcoin/system/stream/streamers/bit_flipper.hpp>
 #include <bitcoin/system/stream/streamers/bit_reader.hpp>
 #include <bitcoin/system/stream/streamers/bit_writer.hpp>

diff --git a/include/bitcoin/system/chain/operation.hpp b/include/bitcoin/system/chain/operation.hpp
@@ -454,6 +454,8 @@ class BC_API operation
             nominal_opcode_from_data(push_data);
     }
 
+    // TODO: use std::optional vs. nullable data member.
+    // TODO: use std::unique_ptr for chunk and xptr on the stack.
     // Operation should not be stored as shared (adds 16 bytes).
     // copy: 8 + 2 * 64 + 1 = 18 bytes (vs. 16 when shared).
     opcode code_;