ledger-tool: Remove unnecessary function to parse ledger path arg (#29952)

This commit is contained in:
steviez 2023-02-01 13:01:58 -06:00 committed by GitHub
parent 7bcb3cef02
commit 90f8c86d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 19 deletions

View File

@ -1,22 +1,9 @@
use {
clap::{value_t, ArgMatches},
std::{
fs,
path::{Path, PathBuf},
process::exit,
},
use std::{
fs,
path::{Path, PathBuf},
process::exit,
};
pub fn parse_ledger_path(matches: &ArgMatches<'_>, name: &str) -> PathBuf {
PathBuf::from(value_t!(matches, name, String).unwrap_or_else(|_err| {
eprintln!(
"Error: Missing --ledger <DIR> argument.\n\n{}",
matches.usage()
);
exit(1);
}))
}
// Canonicalize ledger path to avoid issues with symlink creation
pub fn canonicalize_ledger_path(ledger_path: &Path) -> PathBuf {
fs::canonicalize(ledger_path).unwrap_or_else(|err| {

View File

@ -2312,8 +2312,7 @@ fn main() {
info!("{} {}", crate_name!(), solana_version::version!());
let ledger_path = parse_ledger_path(&matches, "ledger_path");
let ledger_path = PathBuf::from(value_t_or_exit!(matches, "ledger_path", String));
let snapshot_archive_path = value_t!(matches, "snapshot_archive_path", String)
.ok()
.map(PathBuf::from);