From b3b382dde202ad508baf553817c5b38fdd2d4a0c Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sat, 8 Jun 2024 07:46:47 -0400 Subject: [PATCH] random: move rand256() and randbytes() to .h file --- src/random.cpp | 17 ----------------- src/random.h | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/random.cpp b/src/random.cpp index 091f6310292..d6068e958fb 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -659,23 +659,6 @@ void FastRandomContext::RandomSeed() requires_seed = false; } -uint256 FastRandomContext::rand256() noexcept -{ - uint256 ret; - fillrand(MakeWritableByteSpan(ret)); - return ret; -} - -template -std::vector FastRandomContext::randbytes(size_t len) -{ - std::vector ret(len); - fillrand(MakeWritableByteSpan(ret)); - return ret; -} -template std::vector FastRandomContext::randbytes(size_t); -template std::vector FastRandomContext::randbytes(size_t); - void FastRandomContext::fillrand(Span output) { if (requires_seed) RandomSeed(); diff --git a/src/random.h b/src/random.h index f7c20ee4b03..ab9686c5b94 100644 --- a/src/random.h +++ b/src/random.h @@ -213,7 +213,12 @@ public: /** Generate random bytes. */ template - std::vector randbytes(size_t len); + std::vector randbytes(size_t len) + { + std::vector ret(len); + fillrand(MakeWritableByteSpan(ret)); + return ret; + } /** Fill a byte Span with random bytes. */ void fillrand(Span output); @@ -222,7 +227,12 @@ public: uint32_t rand32() noexcept { return randbits(32); } /** generate a random uint256. */ - uint256 rand256() noexcept; + uint256 rand256() noexcept + { + uint256 ret; + fillrand(MakeWritableByteSpan(ret)); + return ret; + } /** Generate a random boolean. */ bool randbool() noexcept { return randbits(1); }