Change ClearDataDirPathCache() to ArgsManager.ClearPathCache().

kiminuo · kiminuo · commit bb8d1c6e029a · 2021-04-18T12:07:00.000+02:00
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -90,7 +90,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     fs::create_directories(m_path_root);
     m_args.ForceSetArg("-datadir", m_path_root.string());
     gArgs.ForceSetArg("-datadir", m_path_root.string());
-    ClearDatadirCache();
+    gArgs.ClearPathCache();
     {
         SetupServerArgs(m_node);
         std::string error;
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -56,19 +56,19 @@ BOOST_AUTO_TEST_CASE(util_datadir)
     const fs::path dd_norm = args.GetDataDirPath();
 
     args.ForceSetArg("-datadir", dd_norm.string() + "/");
-    ClearDatadirCache();
+    args.ClearPathCache();
     BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
 
     args.ForceSetArg("-datadir", dd_norm.string() + "/.");
-    ClearDatadirCache();
+    args.ClearPathCache();
     BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
 
     args.ForceSetArg("-datadir", dd_norm.string() + "/./");
-    ClearDatadirCache();
+    args.ClearPathCache();
     BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
 
     args.ForceSetArg("-datadir", dd_norm.string() + "/.//");
-    ClearDatadirCache();
+    args.ClearPathCache();
     BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
 }
 
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -445,7 +445,7 @@ const fs::path& ArgsManager::GetDataDirPath(bool net_specific) const
     return path;
 }
 
-void ArgsManager::ClearDatadirPathCache()
+void ArgsManager::ClearPathCache()
 {
     LOCK(cs_args);
 
@@ -813,11 +813,6 @@ bool CheckDataDirOption()
     return datadir.empty() || fs::is_directory(fs::system_complete(datadir));
 }
 
-void ClearDatadirCache()
-{
-    gArgs.ClearDatadirPathCache();
-}
-
 fs::path GetConfigFile(const std::string& confPath)
 {
     return AbsPathForConfigVal(fs::path(confPath), false);
@@ -976,7 +971,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
     }
 
     // If datadir is changed in .conf file:
-    ClearDatadirCache();
+    gArgs.ClearPathCache();
     if (!CheckDataDirOption()) {
         error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));
         return false;
diff --git a/src/util/system.h b/src/util/system.h
@@ -94,8 +94,6 @@ fs::path GetDefaultDataDir();
 const fs::path &GetDataDir(bool fNetSpecific = true);
 // Return true if -datadir option points to a valid directory or is not specified.
 bool CheckDataDirOption();
-/** Tests only */
-void ClearDatadirCache();
 fs::path GetConfigFile(const std::string& confPath);
 #ifdef WIN32
 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
@@ -281,9 +279,9 @@ class ArgsManager
     const fs::path& GetDataDirPath(bool net_specific = true) const;
 
     /**
-     * For testing
+     * Clear cached directory paths
      */
-    void ClearDatadirPathCache();
+    void ClearPathCache();
 
     /**
      * Return a vector of strings of the given argument

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve`
`90`	`90`	`fs::create_directories(m_path_root);`
`91`	`91`	`m_args.ForceSetArg("-datadir", m_path_root.string());`
`92`	`92`	`gArgs.ForceSetArg("-datadir", m_path_root.string());`
`93`		`- ClearDatadirCache();`
	`93`	`+ gArgs.ClearPathCache();`
`94`	`94`	`{`
`95`	`95`	`SetupServerArgs(m_node);`
`96`	`96`	`std::string error;`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ const fs::path& ArgsManager::GetDataDirPath(bool net_specific) const`
`445`	`445`	`return path;`
`446`	`446`	`}`
`447`	`447`
`448`		`-void ArgsManager::ClearDatadirPathCache()`
	`448`	`+void ArgsManager::ClearPathCache()`
`449`	`449`	`{`
`450`	`450`	`LOCK(cs_args);`
`451`	`451`
`@@ -813,11 +813,6 @@ bool CheckDataDirOption()`
`813`	`813`	`return datadir.empty() \|\| fs::is_directory(fs::system_complete(datadir));`
`814`	`814`	`}`
`815`	`815`
`816`		`-void ClearDatadirCache()`
`817`		`-{`
`818`		`- gArgs.ClearDatadirPathCache();`
`819`		`-}`
`820`		`-`
`821`	`816`	`fs::path GetConfigFile(const std::string& confPath)`
`822`	`817`	`{`
`823`	`818`	`return AbsPathForConfigVal(fs::path(confPath), false);`
`@@ -976,7 +971,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)`
`976`	`971`	`}`
`977`	`972`
`978`	`973`	`// If datadir is changed in .conf file:`
`979`		`- ClearDatadirCache();`
	`974`	`+ gArgs.ClearPathCache();`
`980`	`975`	`if (!CheckDataDirOption()) {`
`981`	`976`	`error = strprintf("specified data directory \"%s\" does not exist.", GetArg("-datadir", ""));`
`982`	`977`	`return false;`