OBJECT STREAM REWORK

nano/core_test/CMakeLists.txt

@@ -33,6 +33,7 @@ add_executable(
   network.cpp
   network_filter.cpp
   node.cpp
+        object_stream.cpp
   optimistic_scheduler.cpp
   processing_queue.cpp
   processor_service.cpp

nano/core_test/object_stream.cpp

@@ -0,0 +1,293 @@
+#include <nano/lib/numbers.hpp>
+#include <nano/lib/object_stream.hpp>
+#include <nano/lib/object_stream_adapters.hpp>
+#include <nano/secure/utility.hpp>
+#include <nano/test_common/testutil.hpp>
+
+#include <gtest/gtest.h>
+
+#include <chrono>
+#include <cstdint>
+#include <limits>
+#include <thread>
+
+TEST (object_stream, primitive)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("field_name", "field_value");
+
+		std::cout << std::endl;
+	}
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("bool_field", true);
+		obs.write ("bool_field", false);
+
+		std::cout << std::endl;
+	}
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("int_field", 1234);
+		obs.write ("int_field", -1234);
+		obs.write ("int_field", std::numeric_limits<int>::max ());
+		obs.write ("int_field", std::numeric_limits<int>::min ());
+
+		std::cout << std::endl;
+	}
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("uint64_field", (uint64_t)1234);
+		obs.write ("uint64_field", (uint64_t)-1234);
+		obs.write ("uint64_field", std::numeric_limits<uint64_t>::max ());
+		obs.write ("uint64_field", std::numeric_limits<uint64_t>::min ());
+
+		std::cout << std::endl;
+	}
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("float_field", 1234.5678f);
+		obs.write ("float_field", -1234.5678f);
+		obs.write ("float_field", std::numeric_limits<float>::max ());
+		obs.write ("float_field", std::numeric_limits<float>::min ());
+		obs.write ("float_field", std::numeric_limits<float>::lowest ());
+
+		std::cout << std::endl;
+	}
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("double_field", 1234.5678f);
+		obs.write ("double_field", -1234.5678f);
+		obs.write ("double_field", std::numeric_limits<double>::max ());
+		obs.write ("double_field", std::numeric_limits<double>::min ());
+		obs.write ("double_field", std::numeric_limits<double>::lowest ());
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, object_writer_basic)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("object_field", [] (nano::object_stream & obs) {
+			obs.write ("field1", "value1");
+			obs.write ("field2", "value2");
+			obs.write ("field3", true);
+			obs.write ("field4", 1234);
+		});
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, object_writer_nested)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("object_field", [] (nano::object_stream & obs) {
+			obs.write ("field1", "value1");
+
+			obs.write ("nested_object", [] (nano::object_stream & obs) {
+				obs.write ("nested_field1", "nested_value1");
+				obs.write ("nested_field2", false);
+				obs.write ("nested_field3", -1234);
+			});
+
+			obs.write ("field2", "value2");
+			obs.write ("field3", true);
+			obs.write ("field4", 1234);
+		});
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+namespace
+{
+class test_class_basic
+{
+public:
+	nano::uint256_union uint256_union_field{ 0 };
+	nano::block_hash block_hash{ 0 };
+
+	void operator() (nano::object_stream & obs) const
+	{
+		obs.write ("uint256_union_field", uint256_union_field);
+		obs.write ("block_hash", block_hash);
+	}
+};
+}
+
+TEST (object_stream, object_basic)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+
+		test_class_basic test_object{};
+		obs.write ("test_object", test_object);
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+namespace
+{
+class test_class_nested
+{
+public:
+	nano::uint256_union uint256_union_field{ 0 };
+	nano::block_hash block_hash{ 0 };
+
+	test_class_basic nested_object;
+
+	void operator() (nano::object_stream & obs) const
+	{
+		obs.write ("uint256_union_field", uint256_union_field);
+		obs.write ("block_hash", block_hash);
+		obs.write ("nested_object", nested_object);
+	}
+};
+}
+
+TEST (object_stream, object_nested)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+
+		test_class_nested test_object{};
+		obs.write ("test_object", test_object);
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, array_writer_basic)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("array_field", [] (nano::array_stream & ars) {
+			for (int n = 0; n < 10; ++n)
+			{
+				ars.write (n);
+			}
+		});
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, array_writer_objects)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+		obs.write ("array_field", [] (nano::array_stream & ars) {
+			for (int n = 0; n < 3; ++n)
+			{
+				test_class_basic test_object{};
+				ars.write (test_object);
+			}
+		});
+
+		std::cout << std::endl;
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, vote)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	{
+		nano::object_stream obs{ std::cout };
+
+		nano::vote vote{};
+		vote.hashes.push_back (nano::test::random_hash ());
+		vote.hashes.push_back (nano::test::random_hash ());
+		vote.hashes.push_back (nano::test::random_hash ());
+
+		obs.write ("vote", vote);
+	}
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, string_view)
+{
+	// Spacing
+	std::cout << std::endl;
+
+	nano::object_stream obs{ std::cout };
+
+	nano::networks network{ nano::networks::nano_live_network };
+	obs.write ("network", nano::to_string (network));
+
+	// Spacing
+	std::cout << std::endl;
+}
+
+TEST (object_stream, ostream_adapter)
+{
+	using namespace nano;
+
+	// Spacing
+	std::cout << std::endl;
+
+	nano::vote vote{};
+	vote.hashes.push_back (nano::test::random_hash ());
+	vote.hashes.push_back (nano::test::random_hash ());
+	vote.hashes.push_back (nano::test::random_hash ());
+
+	std::cout << "vote: " << vote << std::endl;
+
+	// Spacing
+	std::cout << std::endl;
+}

nano/lib/CMakeLists.txt

@@ -58,7 +58,9 @@ add_library(
   memory.cpp
   numbers.hpp
   numbers.cpp
-  object_stream.hpp
+        object_stream.hpp
+        object_stream_adapters.hpp
+        object_stream_writers.hpp
   observer_set.hpp
   optional_ptr.hpp
   processing_queue.hpp