blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Unify ledger_path arg handling with validator/

This commit is contained in:
Michael Vines 2020-01-23 10:03:23 -07:00
parent 1b3424ff61
commit 1269a79a4d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ledger-tool/src/main.rs
View File

@ -21,7 +21,7 @@ use solana_vote_program::vote_state::VoteState;
use std::{ use std::{
collections::{BTreeMap, HashMap, HashSet}, collections::{BTreeMap, HashMap, HashSet},
ffi::OsStr, ffi::OsStr,
fs::File, fs::{self, File},
io::{self, stdout, Write}, io::{self, stdout, Write},
path::{Path, PathBuf}, path::{Path, PathBuf},
process::{exit, Command, Stdio}, process::{exit, Command, Stdio},
@ -530,13 +530,13 @@ fn main() {
.about(crate_description!()) .about(crate_description!())
.version(solana_clap_utils::version!()) .version(solana_clap_utils::version!())
.arg( .arg(
Arg::with_name("ledger") Arg::with_name("ledger_path")
.short("l") .short("l")
.long("ledger") .long("ledger")
.value_name("DIR") .value_name("DIR")
.takes_value(true) .takes_value(true)
.global(true) .global(true)
.help("Use directory for ledger location"), .help("Use DIR for ledger location"),
) )
.subcommand( .subcommand(
SubCommand::with_name("print") SubCommand::with_name("print")
@ -665,7 +665,13 @@ fn main() {
) )
.get_matches(); .get_matches();
let ledger_path = PathBuf::from(value_t_or_exit!(matches, "ledger", String)); let ledger_path = PathBuf::from(value_t_or_exit!(matches, "ledger_path", String));
// Canonicalize ledger path to avoid issues with symlink creation
let ledger_path = fs::canonicalize(&ledger_path).unwrap_or_else(|err| {
eprintln!("Unable to access ledger path: {:?}", err);
exit(1);
});
match matches.subcommand() { match matches.subcommand() {
("print", Some(args_matches)) => { ("print", Some(args_matches)) => {