aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/init.cpp28
-rw-r--r--src/init/common.cpp24
-rw-r--r--src/init/common.h5
3 files changed, 31 insertions, 26 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 4298494916..05466248b1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -672,30 +672,6 @@ static void StartupNotify(const ArgsManager& args)
}
#endif
-/** Sanity checks
- * Ensure that Bitcoin is running in a usable environment with all
- * necessary library support.
- */
-static bool InitSanityCheck()
-{
- if (!ECC_InitSanityCheck()) {
- return InitError(Untranslated("Elliptic curve cryptography sanity check failure. Aborting."));
- }
-
- if (!glibcxx_sanity_test())
- return false;
-
- if (!Random_SanityCheck()) {
- return InitError(Untranslated("OS cryptographic RNG sanity check failure. Aborting."));
- }
-
- if (!ChronoSanityCheck()) {
- return InitError(Untranslated("Clock epoch mismatch. Aborting."));
- }
-
- return true;
-}
-
static bool AppInitServers(NodeContext& node)
{
const ArgsManager& args = *Assert(node.args);
@@ -1147,9 +1123,9 @@ bool AppInitSanityChecks()
init::SetGlobals();
- // Sanity check
- if (!InitSanityCheck())
+ if (!init::SanityChecks()) {
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), PACKAGE_NAME));
+ }
// Probe the data directory lock to give an early error message, if possible
// We cannot hold the data directory lock here, as the forking for daemon() hasn't yet happened,
diff --git a/src/init/common.cpp b/src/init/common.cpp
index cb24708031..54c3fe3a2e 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -2,11 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#include <compat/sanity.h>
#include <crypto/sha256.h>
#include <key.h>
#include <logging.h>
+#include <node/ui_interface.h>
#include <pubkey.h>
#include <random.h>
+#include <util/time.h>
+#include <util/translation.h>
#include <memory>
@@ -27,4 +31,24 @@ void UnsetGlobals()
globalVerifyHandle.reset();
ECC_Stop();
}
+
+bool SanityChecks()
+{
+ if (!ECC_InitSanityCheck()) {
+ return InitError(Untranslated("Elliptic curve cryptography sanity check failure. Aborting."));
+ }
+
+ if (!glibcxx_sanity_test())
+ return false;
+
+ if (!Random_SanityCheck()) {
+ return InitError(Untranslated("OS cryptographic RNG sanity check failure. Aborting."));
+ }
+
+ if (!ChronoSanityCheck()) {
+ return InitError(Untranslated("Clock epoch mismatch. Aborting."));
+ }
+
+ return true;
+}
} // namespace init
diff --git a/src/init/common.h b/src/init/common.h
index b201232bfc..64a3637370 100644
--- a/src/init/common.h
+++ b/src/init/common.h
@@ -11,6 +11,11 @@
namespace init {
void SetGlobals();
void UnsetGlobals();
+/**
+ * Ensure a usable environment with all
+ * necessary library support.
+ */
+bool SanityChecks();
} // namespace init
#endif // BITCOIN_INIT_COMMON_H