ledger-tool: remove inefficient base58 encoding options
This commit is contained in:
parent
bf37228768
commit
2c0831aa12
|
@ -382,29 +382,24 @@ fn output_account(
|
||||||
println!(" rent_epoch: {}", account.rent_epoch());
|
println!(" rent_epoch: {}", account.rent_epoch());
|
||||||
println!(" data_len: {}", account.data().len());
|
println!(" data_len: {}", account.data().len());
|
||||||
if print_account_data {
|
if print_account_data {
|
||||||
if encoding == UiAccountEncoding::Base58 {
|
let account_data = UiAccount::encode(pubkey, account, encoding, None, None).data;
|
||||||
println!(" data: '{}'", bs58::encode(account.data()).into_string());
|
match account_data {
|
||||||
println!(" encoding: \"base58\"");
|
UiAccountData::Binary(data, data_encoding) => {
|
||||||
} else {
|
println!(" data: '{}'", data);
|
||||||
let account_data = UiAccount::encode(pubkey, account, encoding, None, None).data;
|
println!(
|
||||||
match account_data {
|
" encoding: {}",
|
||||||
UiAccountData::Binary(data, data_encoding) => {
|
serde_json::to_string(&data_encoding).unwrap()
|
||||||
println!(" data: '{}'", data);
|
);
|
||||||
println!(
|
}
|
||||||
" encoding: {}",
|
UiAccountData::Json(account_data) => {
|
||||||
serde_json::to_string(&data_encoding).unwrap()
|
println!(
|
||||||
);
|
" data: '{}'",
|
||||||
}
|
serde_json::to_string(&account_data).unwrap()
|
||||||
UiAccountData::Json(account_data) => {
|
);
|
||||||
println!(
|
println!(" encoding: \"jsonParsed\"");
|
||||||
" data: '{}'",
|
}
|
||||||
serde_json::to_string(&account_data).unwrap()
|
UiAccountData::LegacyBinary(_) => {}
|
||||||
);
|
};
|
||||||
println!(" encoding: \"jsonParsed\"");
|
|
||||||
}
|
|
||||||
UiAccountData::LegacyBinary(_) => {}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1685,8 +1680,8 @@ fn main() {
|
||||||
Arg::with_name("encoding")
|
Arg::with_name("encoding")
|
||||||
.long("encoding")
|
.long("encoding")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.possible_values(&["base58", "base64", "base64+zstd", "jsonParsed"])
|
.possible_values(&["base64", "base64+zstd", "jsonParsed"])
|
||||||
.default_value("base58")
|
.default_value("base64")
|
||||||
.requires("accounts")
|
.requires("accounts")
|
||||||
.help("Print account data in specified format when printing account contents."),
|
.help("Print account data in specified format when printing account contents."),
|
||||||
)
|
)
|
||||||
|
@ -2043,8 +2038,8 @@ fn main() {
|
||||||
Arg::with_name("encoding")
|
Arg::with_name("encoding")
|
||||||
.long("encoding")
|
.long("encoding")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.possible_values(&["base58", "base64", "base64+zstd", "jsonParsed"])
|
.possible_values(&["base64", "base64+zstd", "jsonParsed"])
|
||||||
.default_value("base58")
|
.default_value("base64")
|
||||||
.help("Print account data in specified format when printing account contents."),
|
.help("Print account data in specified format when printing account contents."),
|
||||||
)
|
)
|
||||||
.arg(&max_genesis_archive_unpacked_size_arg)
|
.arg(&max_genesis_archive_unpacked_size_arg)
|
||||||
|
@ -2350,7 +2345,7 @@ fn main() {
|
||||||
Some("jsonParsed") => UiAccountEncoding::JsonParsed,
|
Some("jsonParsed") => UiAccountEncoding::JsonParsed,
|
||||||
Some("base64") => UiAccountEncoding::Base64,
|
Some("base64") => UiAccountEncoding::Base64,
|
||||||
Some("base64+zstd") => UiAccountEncoding::Base64Zstd,
|
Some("base64+zstd") => UiAccountEncoding::Base64Zstd,
|
||||||
_ => UiAccountEncoding::Base58,
|
_ => UiAccountEncoding::Base64,
|
||||||
};
|
};
|
||||||
for (pubkey, account) in genesis_config.accounts {
|
for (pubkey, account) in genesis_config.accounts {
|
||||||
output_account(
|
output_account(
|
||||||
|
@ -3403,7 +3398,7 @@ fn main() {
|
||||||
Some("jsonParsed") => UiAccountEncoding::JsonParsed,
|
Some("jsonParsed") => UiAccountEncoding::JsonParsed,
|
||||||
Some("base64") => UiAccountEncoding::Base64,
|
Some("base64") => UiAccountEncoding::Base64,
|
||||||
Some("base64+zstd") => UiAccountEncoding::Base64Zstd,
|
Some("base64+zstd") => UiAccountEncoding::Base64Zstd,
|
||||||
_ => UiAccountEncoding::Base58,
|
_ => UiAccountEncoding::Base64,
|
||||||
};
|
};
|
||||||
let mut measure = Measure::start("printing account contents");
|
let mut measure = Measure::start("printing account contents");
|
||||||
for (pubkey, (account, slot)) in accounts.into_iter() {
|
for (pubkey, (account, slot)) in accounts.into_iter() {
|
||||||
|
|
Loading…
Reference in New Issue