From 7a95b77e51089c74ba87e90e14bea6af88085793 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Sun, 2 Apr 2017 01:25:15 -0500 Subject: [PATCH] Initializing random_pool along with other globals. --- rai/secure.cpp | 4 +++- rai/utility.cpp | 2 -- rai/utility.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rai/secure.cpp b/rai/secure.cpp index db4db56b9..842e75077 100644 --- a/rai/secure.cpp +++ b/rai/secure.cpp @@ -73,8 +73,9 @@ std::string rai_live_genesis; rai::account genesis_account; std::string genesis_block; rai::uint128_t genesis_amount; +CryptoPP::AutoSeededRandomPool random_pool; }; -ledger_constants const globals; +ledger_constants globals; } size_t constexpr rai::send_block::size; @@ -94,6 +95,7 @@ std::string const & rai::rai_live_genesis (globals.rai_live_genesis); rai::account const & rai::genesis_account (globals.genesis_account); std::string const & rai::genesis_block (globals.genesis_block); rai::uint128_t const & rai::genesis_amount (globals.genesis_amount); +CryptoPP::AutoSeededRandomPool & rai::random_pool (globals.random_pool); boost::filesystem::path rai::working_path () { diff --git a/rai/utility.cpp b/rai/utility.cpp index 8eeb75ebc..212bddbd0 100644 --- a/rai/utility.cpp +++ b/rai/utility.cpp @@ -7,8 +7,6 @@ #include -CryptoPP::AutoSeededRandomPool rai::random_pool; - boost::filesystem::path rai::unique_path () { auto result (working_path () / boost::filesystem::unique_path ()); diff --git a/rai/utility.hpp b/rai/utility.hpp index 6aa28114a..a6c5c749c 100644 --- a/rai/utility.hpp +++ b/rai/utility.hpp @@ -20,7 +20,7 @@ namespace rai { -extern CryptoPP::AutoSeededRandomPool random_pool; +extern CryptoPP::AutoSeededRandomPool & random_pool; // We operate on streams of uint8_t by convention using stream = std::basic_streambuf ; using bufferstream = boost::iostreams::stream_buffer >;