Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
Use the wrapper that automatically checks for error or exits
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Czabaniuk committed Dec 12, 2023
1 parent ca0df2e commit 847a350
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 64 deletions.
75 changes: 17 additions & 58 deletions ledger-tool/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2425,28 +2425,21 @@ fn main() {
force_update_to_open,
enforce_ulimit_nofile,
);
match load_and_process_ledger(
let (bank_forks, _) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
) {
Ok((bank_forks, ..)) => {
);
println!(
"{}",
compute_shred_version(
&genesis_config.hash(),
Some(&bank_forks.read().unwrap().working_bank().hard_forks())
)
);
}
Err(err) => {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
}
}
}
("shred-meta", Some(arg_matches)) => {
#[derive(Debug)]
Expand Down Expand Up @@ -2511,22 +2504,15 @@ fn main() {
force_update_to_open,
enforce_ulimit_nofile,
);
match load_and_process_ledger(
let (bank_forks, _) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
) {
Ok((bank_forks, ..)) => {
);
println!("{}", &bank_forks.read().unwrap().working_bank().hash());
}
Err(err) => {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
}
}
}
("slot", Some(arg_matches)) => {
let slots = values_t_or_exit!(arg_matches, "slots", Slot);
Expand Down Expand Up @@ -2763,18 +2749,15 @@ fn main() {
force_update_to_open,
enforce_ulimit_nofile,
);
let (bank_forks, ..) = load_and_process_ledger(
let (bank_forks, _) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
)
.unwrap_or_else(|err| {
eprintln!("Ledger verification failed: {err:?}");
exit(1);
});
);

if print_accounts_stats {
let working_bank = bank_forks.read().unwrap().working_bank();
working_bank.print_accounts_stats();
Expand Down Expand Up @@ -2814,22 +2797,22 @@ fn main() {
..ProcessOptions::default()
};

let genesis_config = open_genesis_config_by(&ledger_path, arg_matches);
let blockstore = open_blockstore(
&ledger_path,
get_access_type(&process_options),
wal_recovery_mode,
force_update_to_open,
enforce_ulimit_nofile,
);
match load_and_process_ledger(
let (bank_forks, _) = load_and_process_ledger_or_exit(
arg_matches,
&open_genesis_config_by(&ledger_path, arg_matches),
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
) {
Ok((bank_forks, ..)) => {
);
let dot = graph_forks(&bank_forks.read().unwrap(), &graph_config);

let extension = Path::new(&output_file).extension();
Expand All @@ -2846,12 +2829,6 @@ fn main() {
Ok(_) => println!("Wrote {output_file}"),
Err(err) => eprintln!("Unable to write {output_file}: {err}"),
}
}
Err(err) => {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
}
}
}
("create-snapshot", Some(arg_matches)) => {
let is_incremental = arg_matches.is_present("incremental");
Expand Down Expand Up @@ -3007,15 +2984,14 @@ fn main() {
output_directory.display()
);

match load_and_process_ledger(
let (bank_forks, starting_snapshot_hashes) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
blockstore.clone(),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
) {
Ok((bank_forks, starting_snapshot_hashes)) => {
);
let mut bank = bank_forks
.read()
.unwrap()
Expand Down Expand Up @@ -3372,12 +3348,6 @@ fn main() {
"Shred version: {}",
compute_shred_version(&genesis_config.hash(), Some(&bank.hard_forks()))
);
}
Err(err) => {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
}
}
}
("accounts", Some(arg_matches)) => {
let halt_at_slot = value_t!(arg_matches, "halt_at_slot", Slot).ok();
Expand All @@ -3402,18 +3372,14 @@ fn main() {
force_update_to_open,
enforce_ulimit_nofile,
);
let (bank_forks, ..) = load_and_process_ledger(
let (bank_forks, _) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
)
.unwrap_or_else(|err| {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
});
);

let bank = bank_forks.read().unwrap().working_bank();
let mut serializer = serde_json::Serializer::new(stdout());
Expand Down Expand Up @@ -3496,15 +3462,14 @@ fn main() {
force_update_to_open,
enforce_ulimit_nofile,
);
match load_and_process_ledger(
let (bank_forks, ..) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
) {
Ok((bank_forks, ..)) => {
);
let bank_forks = bank_forks.read().unwrap();
let slot = bank_forks.working_bank().slot();
let bank = bank_forks.get(slot).unwrap_or_else(|| {
Expand Down Expand Up @@ -4004,12 +3969,6 @@ fn main() {
println!("RentCollector: {:?}", bank.rent_collector());
println!("Capitalization: {}", Sol(bank.capitalization()));
}
}
Err(err) => {
eprintln!("Failed to load ledger: {err:?}");
exit(1);
}
}
}
("purge", Some(arg_matches)) => {
let start_slot = value_t_or_exit!(arg_matches, "start_slot", Slot);
Expand Down
8 changes: 2 additions & 6 deletions ledger-tool/src/program.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,14 @@ fn load_blockstore(ledger_path: &Path, arg_matches: &ArgMatches<'_>) -> Arc<Bank
force_update_to_open,
enforce_ulimit_nofile,
);
let (bank_forks, ..) = load_and_process_ledger(
let (bank_forks, ..) = load_and_process_ledger_or_exit(
arg_matches,
&genesis_config,
Arc::new(blockstore),
process_options,
snapshot_archive_path,
incremental_snapshot_archive_path,
)
.unwrap_or_else(|err| {
eprintln!("Ledger loading failed: {err:?}");
exit(1);
});
);
let bank = bank_forks.read().unwrap().working_bank();
bank
}
Expand Down

0 comments on commit 847a350

Please sign in to comment.