From fe559d22cbab9bb05239b51a60f777b179699eec Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 29 Oct 2024 17:11:38 +0700
Subject: [PATCH] fix: missing governance.dat, spork.dat do not trigger more
 error message in logs

---
 src/flat-database.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/flat-database.h b/src/flat-database.h
index e36f9f7585941..b17947b7fa11a 100644
--- a/src/flat-database.h
+++ b/src/flat-database.h
@@ -36,7 +36,7 @@ class CFlatDB
     std::string strFilename;
     std::string strMagicMessage;
 
-    bool CoreWrite(const T& objToSave)
+    [[nodiscard]] bool CoreWrite(const T& objToSave)
     {
         // LOCK(objToSave.cs);
 
@@ -53,8 +53,9 @@ class CFlatDB
         // open output file, and associate with CAutoFile
         FILE *file = fsbridge::fopen(pathDB, "wb");
         CAutoFile fileout(file, SER_DISK, CLIENT_VERSION);
-        if (fileout.IsNull())
+        if (fileout.IsNull()) {
             return error("%s: Failed to open file %s", __func__, fs::PathToString(pathDB));
+        }
 
         // Write and commit header, data
         try {
@@ -71,7 +72,7 @@ class CFlatDB
         return true;
     }
 
-    ReadResult CoreRead(T& objToLoad)
+    [[nodiscard]] ReadResult CoreRead(T& objToLoad)
     {
         //LOCK(objToLoad.cs);
 
@@ -79,9 +80,8 @@ class CFlatDB
         // open input file, and associate with CAutoFile
         FILE *file = fsbridge::fopen(pathDB, "rb");
         CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
-        if (filein.IsNull())
-        {
-            error("%s: Failed to open file %s", __func__, fs::PathToString(pathDB));
+        if (filein.IsNull()) {
+            // It is not actually error, maybe it's a first initialization of core.
             return FileError;
         }
 
@@ -156,14 +156,14 @@ class CFlatDB
         return Ok;
     }
 
-    bool Read(T& objToLoad)
+    [[nodiscard]] bool Read(T& objToLoad)
     {
         ReadResult readResult = CoreRead(objToLoad);
         if (readResult == FileError)
             LogPrintf("Missing file %s, will try to recreate\n", strFilename);
         else if (readResult != Ok)
         {
-            LogPrintf("Error reading %s: ", strFilename);
+            LogPrintf("ERROR: CFlatDB::Read Error reading %s: ", strFilename);
             if(readResult == IncorrectFormat)
             {
                 LogPrintf("%s: Magic is ok but data has invalid format, will try to recreate\n", __func__);
@@ -185,7 +185,7 @@ class CFlatDB
     {
     }
 
-    bool Load(T& objToLoad)
+    [[nodiscard]] bool Load(T& objToLoad)
     {
         LogPrintf("Reading info from %s...\n", strFilename);
         return Read(objToLoad);
@@ -200,10 +200,10 @@ class CFlatDB
         int64_t nStart = GetTimeMillis();
 
         LogPrintf("Writing info to %s...\n", strFilename);
-        CoreWrite(objToSave);
+        const bool ret = CoreWrite(objToSave);
         LogPrintf("%s dump finished  %dms\n", strFilename, GetTimeMillis() - nStart);
 
-        return true;
+        return ret;
     }
 };