parity: print correct keys path on startup (#9501)

Author: 5chdn

parity/run.rs

@@ -215,7 +215,7 @@ fn execute_light_impl(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<Runnin
 	cmd.dirs.create_dirs(cmd.dapps_conf.enabled, cmd.ui_conf.enabled, cmd.secretstore_conf.enabled)?;
 
 	//print out running parity environment
-	print_running_environment(&spec.name, &cmd.dirs, &db_dirs, &cmd.dapps_conf);
+	print_running_environment(&spec.data_dir, &cmd.dirs, &db_dirs, &cmd.dapps_conf);
 
 	info!("Running in experimental {} mode.", Colour::Blue.bold().paint("Light Client"));
 
@@ -475,7 +475,7 @@ fn execute_impl<Cr, Rr>(cmd: RunCmd, logger: Arc<RotatingLogger>, on_client_rq:
 	}
 
 	//print out running parity environment
-	print_running_environment(&spec.name, &cmd.dirs, &db_dirs, &cmd.dapps_conf);
+	print_running_environment(&spec.data_dir, &cmd.dirs, &db_dirs, &cmd.dapps_conf);
 
 	// display info about used pruning algorithm
 	info!("State DB configuration: {}{}{}",
@@ -1033,9 +1033,9 @@ fn daemonize(_pid_file: String) -> Result<(), String> {
 	Err("daemon is no supported on windows".into())
 }
 
-fn print_running_environment(spec_name: &String, dirs: &Directories, db_dirs: &DatabaseDirectories, dapps_conf: &dapps::Configuration) {
+fn print_running_environment(data_dir: &str, dirs: &Directories, db_dirs: &DatabaseDirectories, dapps_conf: &dapps::Configuration) {
 	info!("Starting {}", Colour::White.bold().paint(version()));
-	info!("Keys path {}", Colour::White.bold().paint(dirs.keys_path(spec_name).to_string_lossy().into_owned()));
+	info!("Keys path {}", Colour::White.bold().paint(dirs.keys_path(data_dir).to_string_lossy().into_owned()));
 	info!("DB path {}", Colour::White.bold().paint(db_dirs.db_root_path().to_string_lossy().into_owned()));
 	info!("Path to dapps {}", Colour::White.bold().paint(dapps_conf.dapps_path.to_string_lossy().into_owned()));
 }

util/dir/src/lib.rs

@@ -130,9 +130,9 @@ impl Directories {
 	}
 
 	/// Get the keys path
-	pub fn keys_path(&self, spec_name: &str) -> PathBuf {
+	pub fn keys_path(&self, data_dir: &str) -> PathBuf {
 		let mut dir = PathBuf::from(&self.keys);
-		dir.push(spec_name);
+		dir.push(data_dir);
 		dir
 	}
 }