gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ledger path reform: use Path/PathBuf instead of strings (#5344)

Browse Source
This commit is contained in:
Michael Vines
2019-07-30 15:53:41 -07:00
committed by GitHub
parent 294d9288d2
commit c78db6a94b
15 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use solana_sdk::genesis_block::GenesisBlock;
use std::collections::BTreeMap;
use std::fs::File;
use std::io::{stdout, Write};
use std::path::PathBuf;
use std::process::exit;
use std::str::FromStr;
@ -119,20 +120,20 @@ fn main() {
))
.get_matches();
let ledger_path = matches.value_of("ledger").unwrap();
let ledger_path = PathBuf::from(matches.value_of("ledger").unwrap());
let genesis_block = GenesisBlock::load(ledger_path).unwrap_or_else(|err| {
let genesis_block = GenesisBlock::load(&ledger_path).unwrap_or_else(|err| {
eprintln!(
"Failed to open ledger genesis_block at {}: {}",
"Failed to open ledger genesis_block at {:?}: {}",
ledger_path, err
);
exit(1);
});
let blocktree = match Blocktree::open(ledger_path) {
let blocktree = match Blocktree::open(&ledger_path) {
Ok(blocktree) => blocktree,
Err(err) => {
eprintln!("Failed to open ledger at {}: {}", ledger_path, err);
eprintln!("Failed to open ledger at {:?}: {}", ledger_path, err);
exit(1);
}
};