refactor: remove circular dependency governance/object over governance/classes

src/flat-database.h

@@ -117,9 +117,9 @@ class CFlatDB
         }
 
 
-        unsigned char pchMsgTmp[4];
-        std::string strMagicMessageTmp;
         try {
+            unsigned char pchMsgTmp[4];
+            std::string strMagicMessageTmp;
             // de-serialize file header (file specific magic message) and ..
             ssObj >> strMagicMessageTmp;
 
@@ -178,11 +178,11 @@ class CFlatDB
     }
 
 public:
-    CFlatDB(std::string strFilenameIn, std::string strMagicMessageIn)
+    CFlatDB(std::string&& strFilenameIn, std::string&& strMagicMessageIn) :
+        pathDB{gArgs.GetDataDirNet() / strFilenameIn},
+        strFilename{strFilenameIn},
+        strMagicMessage{strMagicMessageIn}
     {
-        pathDB = gArgs.GetDataDirNet() / strFilenameIn;
-        strFilename = strFilenameIn;
-        strMagicMessage = strMagicMessageIn;
     }
 
     bool Load(T& objToLoad)
@@ -191,7 +191,7 @@ class CFlatDB
         return Read(objToLoad);
     }
 
-    bool Store(T& objToSave)
+    bool Store(const T& objToSave)
     {
         LogPrintf("Verifying %s format...\n", strFilename);
         T tmpObjToLoad;