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

Plumb verbose_level through ledger-tool slot subcommand (#21670) 

* Add commas for readability and fix plurality in a printout
* Pass verbose_level into slot subcommand instead of default to max

This is useful for when a full printout isn't necessary, such as just
trying to determine the slot blockhash. The equivalent behavior before
this change would have been using "-vv" with the command.
This commit is contained in:
steviez 2021-12-07 15:14:39 -06:00 committed by GitHub
parent 31b8fd3109
commit 94b1cf47ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ fn output_entry(
match method {
LedgerOutputMethod::Print => {
println!(
" Entry {} - num_hashes: {}, hashes: {}, transactions: {}",
" Entry {} - num_hashes: {}, hash: {}, transactions: {}",
entry_index,
entry.num_hashes,
entry.hash,
@ -201,7 +201,7 @@ fn output_slot(
println!(" Slot Meta {:?} is_full: {}", meta, is_full);
} else {
println!(
" num_shreds: {} parent_slot: {} num_entries: {} is_full: {}",
" num_shreds: {}, parent_slot: {}, num_entries: {}, is_full: {}",
num_shreds,
meta.parent_slot,
entries.len(),
@ -219,7 +219,7 @@ fn output_slot(
output_slot_rewards(blockstore, slot, method);
} else if verbose_level >= 1 {
let mut transactions = 0;
let mut hashes = 0;
let mut num_hashes = 0;
let mut program_ids = HashMap::new();
let blockhash = if let Some(entry) = entries.last() {
entry.hash
@ -229,7 +229,7 @@ fn output_slot(
for entry in entries {
transactions += entry.transactions.len();
hashes += entry.num_hashes;
num_hashes += entry.num_hashes;
for transaction in entry.transactions {
let tx_signature = transaction.signatures[0];
let sanitize_result =
@ -254,8 +254,8 @@ fn output_slot(
}
println!(
" Transactions: {} hashes: {} block_hash: {}",
transactions, hashes, blockhash,
" Transactions: {}, hashes: {}, block_hash: {}",
transactions, num_hashes, blockhash,
);
println!(" Programs: {:?}", program_ids);
}
@ -1845,7 +1845,7 @@ fn main() {
slot,
allow_dead_slots,
&LedgerOutputMethod::Print,
std::u64::MAX,
verbose_level,
) {
eprintln!("{}", err);
}