Remove unneeded GetTempPath, only use temp directory in unit tests

furszy · furszy · commit 5844452f64af · 2021-04-20T10:45:35.000-03:00
Based on btc#6702 btc#6701
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -56,7 +56,7 @@ BasicTestingSetup::~BasicTestingSetup()
 TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
 {
         ClearDatadirCache();
-        pathTemp = GetTempPath() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
+        pathTemp = fs::temp_directory_path() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
         fs::create_directories(pathTemp);
         gArgs.ForceSetArg("-datadir", pathTemp.string());
 
diff --git a/src/util.cpp b/src/util.cpp
@@ -711,11 +711,6 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
 }
 #endif
 
-fs::path GetTempPath()
-{
-    return fs::temp_directory_path();
-}
-
 void runCommand(std::string strCommand)
 {
     if (strCommand.empty()) return;
diff --git a/src/util.h b/src/util.h
@@ -102,7 +102,6 @@ void CreatePidFile(const fs::path& path, pid_t pid);
 #ifdef WIN32
 fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
 #endif
-fs::path GetTempPath();
 
 void runCommand(std::string strCommand);
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ BasicTestingSetup::~BasicTestingSetup()`
`56`	`56`	`TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)`
`57`	`57`	`{`
`58`	`58`	`ClearDatadirCache();`
`59`		`- pathTemp = GetTempPath() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));`
	`59`	`+ pathTemp = fs::temp_directory_path() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));`
`60`	`60`	`fs::create_directories(pathTemp);`
`61`	`61`	`gArgs.ForceSetArg("-datadir", pathTemp.string());`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -711,11 +711,6 @@ fs::path GetSpecialFolderPath(int nFolder, bool fCreate)`
`711`	`711`	`}`
`712`	`712`	`#endif`
`713`	`713`
`714`		`-fs::path GetTempPath()`
`715`		`-{`
`716`		`- return fs::temp_directory_path();`
`717`		`-}`
`718`		`-`
`719`	`714`	`void runCommand(std::string strCommand)`
`720`	`715`	`{`
`721`	`716`	`if (strCommand.empty()) return;`