Revert "Merge pull request #2243 from maqi/record_store_dir_prefixed_…

…with_network_keys"

This reverts commit 147ba8e, reversing
changes made to 00ad51d.

sn_networking/src/driver.rs

@@ -52,8 +52,8 @@ use sn_protocol::{
     messages::{ChunkProof, Nonce, Request, Response},
     storage::{try_deserialize_record, RetryStrategy},
     version::{
-        get_key_version_str, IDENTIFY_CLIENT_VERSION_STR, IDENTIFY_NODE_VERSION_STR,
-        IDENTIFY_PROTOCOL_STR, REQ_RESPONSE_VERSION_STR,
+        IDENTIFY_CLIENT_VERSION_STR, IDENTIFY_NODE_VERSION_STR, IDENTIFY_PROTOCOL_STR,
+        REQ_RESPONSE_VERSION_STR,
     },
     NetworkAddress, PrettyPrintKBucketKey, PrettyPrintRecordKey,
 };
@@ -364,8 +364,7 @@ impl NetworkBuilder {
 
         let store_cfg = {
             // Configures the disk_store to store records under the provided path and increase the max record size
-            // The storage dir is appendixed with key_version str to avoid bringing records from old network into new
-            let storage_dir_path = root_dir.join(format!("record_store_{}", get_key_version_str()));
+            let storage_dir_path = root_dir.join("record_store");
             if let Err(error) = std::fs::create_dir_all(&storage_dir_path) {
                 return Err(NetworkError::FailedToCreateRecordStoreDir {
                     path: storage_dir_path,

sn_protocol/src/version.rs

@@ -58,7 +58,7 @@ fn get_truncate_version_str() -> String {
 /// Get the PKs version string.
 /// If the public key mis-configed via env variable,
 /// it shall result in being rejected to join by the network
-pub fn get_key_version_str() -> String {
+fn get_key_version_str() -> String {
     let mut f_k_str = FOUNDATION_PK.to_hex();
     let _ = f_k_str.split_off(6);
     let mut g_k_str = GENESIS_PK.to_hex();