dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removing legacy path from nano::working_path as versions that use this path are no longer supported in the upgrade path. (#3414)

Browse source
This commit is contained in:
clemahieu 2021-08-06 13:44:52 +01:00 • committed by GitHub
commit 6410c5241a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

38
nano/secure/utility.cpp
View file

@ -6,7 +6,7 @@
static std::vector<boost::filesystem::path> all_unique_paths; static std::vector<boost::filesystem::path> all_unique_paths;
boost::filesystem::path nano::working_path (bool legacy) boost::filesystem::path nano::working_path ()
{ {
static nano::network_constants network_constants; static nano::network_constants network_constants;
auto result (nano::app_path ()); auto result (nano::app_path ());
@ -16,44 +16,16 @@ boost::filesystem::path nano::working_path (bool legacy)
release_assert (false); release_assert (false);
break; break;
case nano::networks::nano_dev_network: case nano::networks::nano_dev_network:
if (!legacy) result /= "NanoDev";
{
result /= "NanoDev";
}
else
{
result /= "RaiBlocksDev";
}
break; break;
case nano::networks::nano_beta_network: case nano::networks::nano_beta_network:
if (!legacy) result /= "NanoBeta";
{
result /= "NanoBeta";
}
else
{
result /= "RaiBlocksBeta";
}
break; break;
case nano::networks::nano_live_network: case nano::networks::nano_live_network:
if (!legacy) result /= "Nano";
{
result /= "Nano";
}
else
{
result /= "RaiBlocks";
}
break; break;
case nano::networks::nano_test_network: case nano::networks::nano_test_network:
if (!legacy) result /= "NanoTest";
{
result /= "NanoTest";
}
else
{
result /= "RaiBlocksTest";
}
break; break;
} }
return result; return result;

2
nano/secure/utility.hpp
View file

@ -7,7 +7,7 @@
namespace nano namespace nano
{ {
// OS-specific way of finding a path to a home directory. // OS-specific way of finding a path to a home directory.
boost::filesystem::path working_path (bool = false); boost::filesystem::path working_path ();
// Get a unique path within the home directory, used for testing. // Get a unique path within the home directory, used for testing.
// Any directories created at this location will be removed when a test finishes. // Any directories created at this location will be removed when a test finishes.
boost::filesystem::path unique_path (); boost::filesystem::path unique_path ();