refactor: Reduce number of SanityChecks return values

This commit is contained in:
Ryan Ofsky
2022-06-07 21:08:56 -04:00
parent b3e7de7ee6
commit 6db6552377
3 changed files with 10 additions and 26 deletions

View File

@@ -1096,21 +1096,8 @@ static bool LockDataDirectory(bool probeOnly)
bool AppInitSanityChecks(const kernel::Context& kernel)
{
// ********************************************************* Step 4: sanity checks
auto maybe_error = kernel::SanityChecks(kernel);
if (maybe_error.has_value()) {
switch (maybe_error.value()) {
case kernel::SanityCheckError::ERROR_ECC:
InitError(Untranslated("Elliptic curve cryptography sanity check failure. Aborting."));
break;
case kernel::SanityCheckError::ERROR_RANDOM:
InitError(Untranslated("OS cryptographic RNG sanity check failure. Aborting."));
break;
case kernel::SanityCheckError::ERROR_CHRONO:
InitError(Untranslated("Clock epoch mismatch. Aborting."));
break;
} // no default case, so the compiler can warn about missing cases
if (auto error = kernel::SanityChecks(kernel)) {
InitError(*error);
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), PACKAGE_NAME));
}