merge bitcoin#28012: Allow FastRandomContext::randbytes for std::byte, Allow std::byte serialization

kwvg · PastaPastaPasta · commit 2b26a8787426 · 2024-02-28T13:37:36.000-06:00
diff --git a/src/random.cpp b/src/random.cpp
@@ -630,15 +630,18 @@ uint256 FastRandomContext::rand256() noexcept
     return ret;
 }
 
-std::vector<unsigned char> FastRandomContext::randbytes(size_t len)
+template <typename B>
+std::vector<B> FastRandomContext::randbytes(size_t len)
 {
     if (requires_seed) RandomSeed();
-    std::vector<unsigned char> ret(len);
+    std::vector<B> ret(len);
     if (len > 0) {
-        rng.Keystream(ret.data(), len);
+        rng.Keystream(UCharCast(ret.data()), len);
     }
     return ret;
 }
+template std::vector<unsigned char> FastRandomContext::randbytes(size_t);
+template std::vector<std::byte> FastRandomContext::randbytes(size_t);
 
 void FastRandomContext::fillrand(Span<std::byte> output)
 {
diff --git a/src/random.h b/src/random.h
@@ -200,7 +200,8 @@ class FastRandomContext
     }
 
     /** Generate random bytes. */
-    std::vector<unsigned char> randbytes(size_t len);
+    template <typename B = unsigned char>
+    std::vector<B> randbytes(size_t len);
 
     /** Fill a byte Span with random bytes. */
     void fillrand(Span<std::byte> output);
diff --git a/src/serialize.h b/src/serialize.h
@@ -196,6 +196,7 @@ template<typename X> const X& ReadWriteAsHelper(const X& x) { return x; }
 #ifndef CHAR_EQUALS_INT8
 template <typename Stream> void Serialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
 #endif
+template <typename Stream> void Serialize(Stream& s, std::byte a) { ser_writedata8(s, uint8_t(a)); }
 template<typename Stream> inline void Serialize(Stream& s, int8_t a  ) { ser_writedata8(s, a); }
 template<typename Stream> inline void Serialize(Stream& s, uint8_t a ) { ser_writedata8(s, a); }
 template<typename Stream> inline void Serialize(Stream& s, int16_t a ) { ser_writedata16(s, a); }
@@ -211,6 +212,7 @@ template <typename Stream, typename B> void Serialize(Stream& s, Span<B> span) {
 #ifndef CHAR_EQUALS_INT8
 template <typename Stream> void Unserialize(Stream&, char) = delete; // char serialization forbidden. Use uint8_t or int8_t
 #endif
+template <typename Stream> void Unserialize(Stream& s, std::byte& a) { a = std::byte{ser_readdata8(s)}; }
 template<typename Stream> inline void Unserialize(Stream& s, int8_t& a  ) { a = ser_readdata8(s); }
 template<typename Stream> inline void Unserialize(Stream& s, uint8_t& a ) { a = ser_readdata8(s); }
 template<typename Stream> inline void Unserialize(Stream& s, int16_t& a ) { a = ser_readdata16(s); }
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
@@ -295,11 +295,13 @@ BOOST_AUTO_TEST_CASE(class_methods)
     {
         DataStream ds;
         const std::string in{"ab"};
-        ds << Span{in};
+        ds << Span{in} << std::byte{'c'};
         std::array<std::byte, 2> out;
-        ds >> Span{out};
+        std::byte out_3;
+        ds >> Span{out} >> out_3;
         BOOST_CHECK_EQUAL(out.at(0), std::byte{'a'});
         BOOST_CHECK_EQUAL(out.at(1), std::byte{'b'});
+        BOOST_CHECK_EQUAL(out_3, std::byte{'c'});
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -630,15 +630,18 @@ uint256 FastRandomContext::rand256() noexcept`
`630`	`630`	`return ret;`
`631`	`631`	`}`
`632`	`632`
`633`		`-std::vector<unsigned char> FastRandomContext::randbytes(size_t len)`
	`633`	`+template <typename B>`
	`634`	`+std::vector<B> FastRandomContext::randbytes(size_t len)`
`634`	`635`	`{`
`635`	`636`	`if (requires_seed) RandomSeed();`
`636`		`- std::vector<unsigned char> ret(len);`
	`637`	`+ std::vector<B> ret(len);`
`637`	`638`	`if (len > 0) {`
`638`		`- rng.Keystream(ret.data(), len);`
	`639`	`+ rng.Keystream(UCharCast(ret.data()), len);`
`639`	`640`	`}`
`640`	`641`	`return ret;`
`641`	`642`	`}`
	`643`	`+template std::vector<unsigned char> FastRandomContext::randbytes(size_t);`
	`644`	`+template std::vector<std::byte> FastRandomContext::randbytes(size_t);`
`642`	`645`
`643`	`646`	`void FastRandomContext::fillrand(Span<std::byte> output)`
`644`	`647`	`{`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ class FastRandomContext`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`/** Generate random bytes. */`
`203`		`- std::vector<unsigned char> randbytes(size_t len);`
	`203`	`+ template <typename B = unsigned char>`
	`204`	`+ std::vector<B> randbytes(size_t len);`
`204`	`205`
`205`	`206`	`/** Fill a byte Span with random bytes. */`
`206`	`207`	`void fillrand(Span<std::byte> output);`
Original file line number	Diff line number	Diff line change
`@@ -295,11 +295,13 @@ BOOST_AUTO_TEST_CASE(class_methods)`
`295`	`295`	`{`
`296`	`296`	`DataStream ds;`
`297`	`297`	`const std::string in{"ab"};`
`298`		`- ds << Span{in};`
	`298`	`+ ds << Span{in} << std::byte{'c'};`
`299`	`299`	`std::array<std::byte, 2> out;`
`300`		`- ds >> Span{out};`
	`300`	`+ std::byte out_3;`
	`301`	`+ ds >> Span{out} >> out_3;`
`301`	`302`	`BOOST_CHECK_EQUAL(out.at(0), std::byte{'a'});`
`302`	`303`	`BOOST_CHECK_EQUAL(out.at(1), std::byte{'b'});`
	`304`	`+ BOOST_CHECK_EQUAL(out_3, std::byte{'c'});`
`303`	`305`	`}`
`304`	`306`	`}`
`305`	`307`