From 6410c5241a5679ceb0997ab3c34ed81cc8c7cd55 Mon Sep 17 00:00:00 2001
From: clemahieu <clemahieu@gmail.com>
Date: Fri, 6 Aug 2021 13:44:52 +0100
Subject: [PATCH] Removing legacy path from nano::working_path as versions that
 use this path are no longer supported in the upgrade path. (#3414)

---
 nano/secure/utility.cpp | 38 +++++---------------------------------
 nano/secure/utility.hpp |  2 +-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/nano/secure/utility.cpp b/nano/secure/utility.cpp
index 67637f9667..c15de73972 100644
--- a/nano/secure/utility.cpp
+++ b/nano/secure/utility.cpp
@@ -6,7 +6,7 @@
 
 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;
 	auto result (nano::app_path ());
@@ -16,44 +16,16 @@ boost::filesystem::path nano::working_path (bool legacy)
 			release_assert (false);
 			break;
 		case nano::networks::nano_dev_network:
-			if (!legacy)
-			{
-				result /= "NanoDev";
-			}
-			else
-			{
-				result /= "RaiBlocksDev";
-			}
+			result /= "NanoDev";
 			break;
 		case nano::networks::nano_beta_network:
-			if (!legacy)
-			{
-				result /= "NanoBeta";
-			}
-			else
-			{
-				result /= "RaiBlocksBeta";
-			}
+			result /= "NanoBeta";
 			break;
 		case nano::networks::nano_live_network:
-			if (!legacy)
-			{
-				result /= "Nano";
-			}
-			else
-			{
-				result /= "RaiBlocks";
-			}
+			result /= "Nano";
 			break;
 		case nano::networks::nano_test_network:
-			if (!legacy)
-			{
-				result /= "NanoTest";
-			}
-			else
-			{
-				result /= "RaiBlocksTest";
-			}
+			result /= "NanoTest";
 			break;
 	}
 	return result;
diff --git a/nano/secure/utility.hpp b/nano/secure/utility.hpp
index 0d090e5d81..71b5983462 100644
--- a/nano/secure/utility.hpp
+++ b/nano/secure/utility.hpp
@@ -7,7 +7,7 @@
 namespace nano
 {
 // 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.
 // Any directories created at this location will be removed when a test finishes.
 boost::filesystem::path unique_path ();