Bump indicatif from 0.15.0 to 0.16.2 (#17628)
* Bump indicatif from 0.15.0 to 0.16.2 Bumps [indicatif](https://github.com/mitsuhiko/indicatif) from 0.15.0 to 0.16.2. - [Release notes](https://github.com/mitsuhiko/indicatif/releases) - [Commits](https://github.com/mitsuhiko/indicatif/compare/0.15.0...0.16.2) Signed-off-by: dependabot[bot] <support@github.com> * [auto-commit] Update all Cargo lock files * Fix message types Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot-buildkite <dependabot-buildkite@noreply.solana.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
8
Cargo.lock
generated
8
Cargo.lock
generated
@ -1957,9 +1957,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indicatif"
|
name = "indicatif"
|
||||||
version = "0.15.0"
|
version = "0.16.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
|
checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console 0.14.1",
|
"console 0.14.1",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
@ -2637,9 +2637,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "number_prefix"
|
name = "number_prefix"
|
||||||
version = "0.3.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
|
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
|
@ -15,7 +15,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
|
|||||||
console = "0.14.1"
|
console = "0.14.1"
|
||||||
humantime = "2.0.1"
|
humantime = "2.0.1"
|
||||||
Inflector = "0.11.4"
|
Inflector = "0.11.4"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
serde = "1.0.126"
|
serde = "1.0.126"
|
||||||
serde_derive = "1.0.103"
|
serde_derive = "1.0.103"
|
||||||
serde_json = "1.0.56"
|
serde_json = "1.0.56"
|
||||||
|
@ -20,7 +20,7 @@ console = "0.14.1"
|
|||||||
dirs-next = "2.0.0"
|
dirs-next = "2.0.0"
|
||||||
log = "0.4.11"
|
log = "0.4.11"
|
||||||
Inflector = "0.11.4"
|
Inflector = "0.11.4"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
humantime = "2.0.1"
|
humantime = "2.0.1"
|
||||||
num-traits = "0.2"
|
num-traits = "0.2"
|
||||||
pretty-hex = "0.2.1"
|
pretty-hex = "0.2.1"
|
||||||
|
@ -737,12 +737,10 @@ pub fn process_catchup(
|
|||||||
if let Some(rpc_addr) = contact_info.rpc {
|
if let Some(rpc_addr) = contact_info.rpc {
|
||||||
break rpc_addr;
|
break rpc_addr;
|
||||||
}
|
}
|
||||||
progress_bar.set_message(&format!("RPC service not found for {}", node_pubkey));
|
progress_bar.set_message(format!("RPC service not found for {}", node_pubkey));
|
||||||
} else {
|
} else {
|
||||||
progress_bar.set_message(&format!(
|
progress_bar
|
||||||
"Contact information not found for {}",
|
.set_message(format!("Contact information not found for {}", node_pubkey));
|
||||||
node_pubkey
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
sleep(Duration::from_secs(sleep_interval as u64));
|
sleep(Duration::from_secs(sleep_interval as u64));
|
||||||
};
|
};
|
||||||
@ -758,7 +756,7 @@ pub fn process_catchup(
|
|||||||
Ok(reported_node_pubkey) => break reported_node_pubkey,
|
Ok(reported_node_pubkey) => break reported_node_pubkey,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
if let ClientErrorKind::Reqwest(err) = err.kind() {
|
if let ClientErrorKind::Reqwest(err) = err.kind() {
|
||||||
progress_bar.set_message(&format!("Connection failed: {}", err));
|
progress_bar.set_message(format!("Connection failed: {}", err));
|
||||||
sleep(Duration::from_secs(sleep_interval as u64));
|
sleep(Duration::from_secs(sleep_interval as u64));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -858,7 +856,7 @@ pub fn process_catchup(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"{} slot(s) {} (us:{} them:{}){}",
|
"{} slot(s) {} (us:{} them:{}){}",
|
||||||
slot_distance.abs(),
|
slot_distance.abs(),
|
||||||
if slot_distance >= 0 {
|
if slot_distance >= 0 {
|
||||||
@ -1134,7 +1132,7 @@ pub fn process_show_block_production(
|
|||||||
};
|
};
|
||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"Fetching confirmed blocks between slots {} and {}...",
|
"Fetching confirmed blocks between slots {} and {}...",
|
||||||
start_slot, end_slot
|
start_slot, end_slot
|
||||||
));
|
));
|
||||||
@ -1197,7 +1195,7 @@ pub fn process_show_block_production(
|
|||||||
let mut leader_slot_count = HashMap::new();
|
let mut leader_slot_count = HashMap::new();
|
||||||
let mut leader_skipped_slots = HashMap::new();
|
let mut leader_skipped_slots = HashMap::new();
|
||||||
|
|
||||||
progress_bar.set_message(&format!("Fetching leader schedule for epoch {}...", epoch));
|
progress_bar.set_message(format!("Fetching leader schedule for epoch {}...", epoch));
|
||||||
let leader_schedule = rpc_client
|
let leader_schedule = rpc_client
|
||||||
.get_leader_schedule_with_commitment(Some(start_slot), CommitmentConfig::finalized())?;
|
.get_leader_schedule_with_commitment(Some(start_slot), CommitmentConfig::finalized())?;
|
||||||
if leader_schedule.is_none() {
|
if leader_schedule.is_none() {
|
||||||
@ -1216,7 +1214,7 @@ pub fn process_show_block_production(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"Processing {} slots containing {} blocks and {} empty slots...",
|
"Processing {} slots containing {} blocks and {} empty slots...",
|
||||||
total_slots, total_blocks_produced, total_slots_skipped
|
total_slots, total_blocks_produced, total_slots_skipped
|
||||||
));
|
));
|
||||||
@ -1610,9 +1608,8 @@ pub fn process_live_slots(config: &CliConfig) -> ProcessResult {
|
|||||||
"{:?} | root slot advancing at {:.2} slots/second",
|
"{:?} | root slot advancing at {:.2} slots/second",
|
||||||
new_info, slots_per_second
|
new_info, slots_per_second
|
||||||
)
|
)
|
||||||
}
|
};
|
||||||
.to_owned();
|
slot_progress.set_message(message.clone());
|
||||||
slot_progress.set_message(&message);
|
|
||||||
|
|
||||||
if let Some(previous) = current {
|
if let Some(previous) = current {
|
||||||
let slot_delta: i64 = new_info.slot as i64 - previous.slot as i64;
|
let slot_delta: i64 = new_info.slot as i64 - previous.slot as i64;
|
||||||
|
@ -2012,7 +2012,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
|
|||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
pending_transactions.insert(transaction.signatures[0], transaction);
|
pending_transactions.insert(transaction.signatures[0], transaction);
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"[{}/{}] Transactions sent",
|
"[{}/{}] Transactions sent",
|
||||||
pending_transactions.len(),
|
pending_transactions.len(),
|
||||||
num_transactions
|
num_transactions
|
||||||
@ -2050,7 +2050,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
slot = rpc_client.get_slot()?;
|
slot = rpc_client.get_slot()?;
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"[{}/{}] Transactions confirmed. Retrying in {} slots",
|
"[{}/{}] Transactions confirmed. Retrying in {} slots",
|
||||||
num_transactions - pending_transactions.len(),
|
num_transactions - pending_transactions.len(),
|
||||||
num_transactions,
|
num_transactions,
|
||||||
|
@ -14,7 +14,7 @@ base64 = "0.13.0"
|
|||||||
bincode = "1.3.1"
|
bincode = "1.3.1"
|
||||||
bs58 = "0.4.0"
|
bs58 = "0.4.0"
|
||||||
clap = "2.33.0"
|
clap = "2.33.0"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
jsonrpc-core = "17.0.0"
|
jsonrpc-core = "17.0.0"
|
||||||
log = "0.4.11"
|
log = "0.4.11"
|
||||||
net2 = "0.2.37"
|
net2 = "0.2.37"
|
||||||
|
@ -1846,7 +1846,7 @@ impl RpcClient {
|
|||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"[{}/{}] Finalizing transaction {}",
|
"[{}/{}] Finalizing transaction {}",
|
||||||
confirmations, desired_confirmations, signature,
|
confirmations, desired_confirmations, signature,
|
||||||
));
|
));
|
||||||
@ -1899,7 +1899,7 @@ impl RpcClient {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"[{}/{}] Finalizing transaction {}",
|
"[{}/{}] Finalizing transaction {}",
|
||||||
min(confirmations + 1, desired_confirmations),
|
min(confirmations + 1, desired_confirmations),
|
||||||
desired_confirmations,
|
desired_confirmations,
|
||||||
|
@ -12,7 +12,7 @@ edition = "2018"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
bzip2 = "0.3.3"
|
bzip2 = "0.3.3"
|
||||||
console = "0.14.1"
|
console = "0.14.1"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
log = "0.4.11"
|
log = "0.4.11"
|
||||||
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||||
solana-sdk = { path = "../sdk", version = "=1.8.0" }
|
solana-sdk = { path = "../sdk", version = "=1.8.0" }
|
||||||
|
@ -78,7 +78,7 @@ pub fn download_file<'a, 'b>(
|
|||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
if use_progress_bar {
|
if use_progress_bar {
|
||||||
progress_bar.set_message(&format!("{}Downloading {}...", TRUCK, url));
|
progress_bar.set_message(format!("{}Downloading {}...", TRUCK, url));
|
||||||
}
|
}
|
||||||
|
|
||||||
let response = reqwest::blocking::Client::new()
|
let response = reqwest::blocking::Client::new()
|
||||||
@ -108,7 +108,7 @@ pub fn download_file<'a, 'b>(
|
|||||||
)
|
)
|
||||||
.progress_chars("=> "),
|
.progress_chars("=> "),
|
||||||
);
|
);
|
||||||
progress_bar.set_message(&format!("{}Downloading~ {}", TRUCK, url));
|
progress_bar.set_message(format!("{}Downloading~ {}", TRUCK, url));
|
||||||
} else {
|
} else {
|
||||||
info!("Downloading {} bytes from {}", download_size, url);
|
info!("Downloading {} bytes from {}", download_size, url);
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ clap = { version = "2.33.1" }
|
|||||||
console = "0.14.1"
|
console = "0.14.1"
|
||||||
ctrlc = { version = "3.1.5", features = ["termination"] }
|
ctrlc = { version = "3.1.5", features = ["termination"] }
|
||||||
dirs-next = "2.0.0"
|
dirs-next = "2.0.0"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
nix = "0.19.0"
|
nix = "0.19.0"
|
||||||
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }
|
||||||
|
@ -94,7 +94,7 @@ fn download_to_temp(
|
|||||||
let client = reqwest::blocking::Client::new();
|
let client = reqwest::blocking::Client::new();
|
||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Downloading...", TRUCK));
|
progress_bar.set_message(format!("{}Downloading...", TRUCK));
|
||||||
|
|
||||||
let response = client.get(url.as_str()).send()?;
|
let response = client.get(url.as_str()).send()?;
|
||||||
let download_size = {
|
let download_size = {
|
||||||
@ -114,7 +114,7 @@ fn download_to_temp(
|
|||||||
)
|
)
|
||||||
.progress_chars("=> "),
|
.progress_chars("=> "),
|
||||||
);
|
);
|
||||||
progress_bar.set_message(&format!("{}Downloading", TRUCK));
|
progress_bar.set_message(format!("{}Downloading", TRUCK));
|
||||||
|
|
||||||
struct DownloadProgress<R> {
|
struct DownloadProgress<R> {
|
||||||
progress_bar: ProgressBar,
|
progress_bar: ProgressBar,
|
||||||
@ -158,7 +158,7 @@ fn extract_release_archive(
|
|||||||
use tar::Archive;
|
use tar::Archive;
|
||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Extracting...", PACKAGE));
|
progress_bar.set_message(format!("{}Extracting...", PACKAGE));
|
||||||
|
|
||||||
if extract_dir.exists() {
|
if extract_dir.exists() {
|
||||||
let _ = fs::remove_dir_all(&extract_dir);
|
let _ = fs::remove_dir_all(&extract_dir);
|
||||||
@ -694,7 +694,7 @@ pub fn deploy(
|
|||||||
// Confirm the `json_rpc_url` is good and that `from_keypair` is a valid account
|
// Confirm the `json_rpc_url` is good and that `from_keypair` is a valid account
|
||||||
let rpc_client = RpcClient::new(json_rpc_url.to_string());
|
let rpc_client = RpcClient::new(json_rpc_url.to_string());
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Checking cluster...", LOOKING_GLASS));
|
progress_bar.set_message(format!("{}Checking cluster...", LOOKING_GLASS));
|
||||||
let balance = rpc_client
|
let balance = rpc_client
|
||||||
.get_balance(&from_keypair.pubkey())
|
.get_balance(&from_keypair.pubkey())
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
@ -743,7 +743,7 @@ pub fn deploy(
|
|||||||
println_name_value("Update target:", &release_target);
|
println_name_value("Update target:", &release_target);
|
||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Deploying update...", PACKAGE));
|
progress_bar.set_message(format!("{}Deploying update...", PACKAGE));
|
||||||
|
|
||||||
// Construct an update manifest for the release
|
// Construct an update manifest for the release
|
||||||
let mut update_manifest = SignedUpdateManifest {
|
let mut update_manifest = SignedUpdateManifest {
|
||||||
@ -825,7 +825,7 @@ pub fn gc(config_file: &str) -> Result<(), String> {
|
|||||||
.template("{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {pos}/{len} ({eta})")
|
.template("{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {pos}/{len} ({eta})")
|
||||||
.progress_chars("=> "),
|
.progress_chars("=> "),
|
||||||
);
|
);
|
||||||
progress_bar.set_message(&format!("{}Removing old releases", RECYCLING));
|
progress_bar.set_message(format!("{}Removing old releases", RECYCLING));
|
||||||
for (release, _modified_type) in old_releases {
|
for (release, _modified_type) in old_releases {
|
||||||
progress_bar.inc(1);
|
progress_bar.inc(1);
|
||||||
let _ = fs::remove_dir_all(&release);
|
let _ = fs::remove_dir_all(&release);
|
||||||
@ -919,7 +919,7 @@ pub fn init_or_update(config_file: &str, is_init: bool, check_only: bool) -> Res
|
|||||||
match explicit_release {
|
match explicit_release {
|
||||||
ExplicitRelease::Semver(current_release_semver) => {
|
ExplicitRelease::Semver(current_release_semver) => {
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Checking for updates...", LOOKING_GLASS));
|
progress_bar.set_message(format!("{}Checking for updates...", LOOKING_GLASS));
|
||||||
|
|
||||||
let github_release = check_for_newer_github_release(
|
let github_release = check_for_newer_github_release(
|
||||||
semver::VersionReq::parse(&format!(
|
semver::VersionReq::parse(&format!(
|
||||||
@ -1041,7 +1041,7 @@ pub fn init_or_update(config_file: &str, is_init: bool, check_only: bool) -> Res
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
progress_bar.set_message(&format!("{}Checking for updates...", LOOKING_GLASS));
|
progress_bar.set_message(format!("{}Checking for updates...", LOOKING_GLASS));
|
||||||
let rpc_client = RpcClient::new(config.json_rpc_url.clone());
|
let rpc_client = RpcClient::new(config.json_rpc_url.clone());
|
||||||
let update_manifest = get_update_manifest(&rpc_client, &config.update_manifest_pubkey)?;
|
let update_manifest = get_update_manifest(&rpc_client, &config.update_manifest_pubkey)?;
|
||||||
progress_bar.finish_and_clear();
|
progress_bar.finish_and_clear();
|
||||||
|
8
programs/bpf/Cargo.lock
generated
8
programs/bpf/Cargo.lock
generated
@ -1383,9 +1383,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indicatif"
|
name = "indicatif"
|
||||||
version = "0.15.0"
|
version = "0.16.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4"
|
checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console 0.14.1",
|
"console 0.14.1",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
@ -1829,9 +1829,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "number_prefix"
|
name = "number_prefix"
|
||||||
version = "0.3.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
|
checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
|
@ -17,7 +17,7 @@ csv = "1.1.3"
|
|||||||
ctrlc = { version = "3.1.5", features = ["termination"] }
|
ctrlc = { version = "3.1.5", features = ["termination"] }
|
||||||
dirs-next = "2.0.0"
|
dirs-next = "2.0.0"
|
||||||
indexmap = "1.5.1"
|
indexmap = "1.5.1"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
pickledb = "0.4.1"
|
pickledb = "0.4.1"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
solana-account-decoder = { path = "../account-decoder", version = "=1.8.0" }
|
solana-account-decoder = { path = "../account-decoder", version = "=1.8.0" }
|
||||||
|
@ -593,7 +593,7 @@ fn finalize_transactions(
|
|||||||
|
|
||||||
while opt_confirmations.is_some() {
|
while opt_confirmations.is_some() {
|
||||||
if let Some(confirmations) = opt_confirmations {
|
if let Some(confirmations) = opt_confirmations {
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"[{}/{}] Finalizing transactions",
|
"[{}/{}] Finalizing transactions",
|
||||||
confirmations, 32,
|
confirmations, 32,
|
||||||
));
|
));
|
||||||
|
@ -18,7 +18,7 @@ clap = "2.33.1"
|
|||||||
console = "0.14.1"
|
console = "0.14.1"
|
||||||
core_affinity = "0.5.10"
|
core_affinity = "0.5.10"
|
||||||
fd-lock = "2.0.0"
|
fd-lock = "2.0.0"
|
||||||
indicatif = "0.15.0"
|
indicatif = "0.16.2"
|
||||||
jsonrpc-core = "17.0.0"
|
jsonrpc-core = "17.0.0"
|
||||||
jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] }
|
jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] }
|
||||||
jsonrpc-derive = "17.0.0"
|
jsonrpc-derive = "17.0.0"
|
||||||
|
@ -143,7 +143,7 @@ impl Dashboard {
|
|||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"{}{}{}| \
|
"{}{}{}| \
|
||||||
Processed Slot: {} | Confirmed Slot: {} | Finalized Slot: {} | \
|
Processed Slot: {} | Confirmed Slot: {} | Finalized Slot: {} | \
|
||||||
Snapshot Slot: {} | \
|
Snapshot Slot: {} | \
|
||||||
@ -172,7 +172,7 @@ impl Dashboard {
|
|||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
progress_bar
|
progress_bar
|
||||||
.abandon_with_message(&format!("RPC connection failure: {}", err));
|
.abandon_with_message(format!("RPC connection failure: {}", err));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -197,7 +197,7 @@ async fn wait_for_validator_startup(
|
|||||||
match admin_rpc_service::connect(&ledger_path).await {
|
match admin_rpc_service::connect(&ledger_path).await {
|
||||||
Ok(new_admin_client) => admin_client = Some(new_admin_client),
|
Ok(new_admin_client) => admin_client = Some(new_admin_client),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
progress_bar.set_message(&format!("Unable to connect to validator: {}", err));
|
progress_bar.set_message(format!("Unable to connect to validator: {}", err));
|
||||||
thread::sleep(refresh_interval);
|
thread::sleep(refresh_interval);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -216,22 +216,21 @@ async fn wait_for_validator_startup(
|
|||||||
}
|
}
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok((None, _)) => progress_bar.set_message(&"RPC service not available"),
|
Ok((None, _)) => progress_bar.set_message("RPC service not available"),
|
||||||
Ok((Some(rpc_addr), start_time)) => return Some((rpc_addr, start_time)),
|
Ok((Some(rpc_addr), start_time)) => return Some((rpc_addr, start_time)),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
progress_bar
|
progress_bar
|
||||||
.set_message(&format!("Failed to get validator info: {}", err));
|
.set_message(format!("Failed to get validator info: {}", err));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
progress_bar
|
progress_bar.set_message(format!("Validator startup: {:?}...", start_progress));
|
||||||
.set_message(&format!("Validator startup: {:?}...", start_progress));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
admin_client = None;
|
admin_client = None;
|
||||||
progress_bar
|
progress_bar
|
||||||
.set_message(&format!("Failed to get validator start progress: {}", err));
|
.set_message(format!("Failed to get validator start progress: {}", err));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
thread::sleep(refresh_interval);
|
thread::sleep(refresh_interval);
|
||||||
|
@ -5,7 +5,7 @@ use {
|
|||||||
console::style,
|
console::style,
|
||||||
indicatif::{ProgressDrawTarget, ProgressStyle},
|
indicatif::{ProgressDrawTarget, ProgressStyle},
|
||||||
log::*,
|
log::*,
|
||||||
std::{env, process::exit, thread::JoinHandle},
|
std::{borrow::Cow, env, fmt::Display, process::exit, thread::JoinHandle},
|
||||||
};
|
};
|
||||||
|
|
||||||
pub mod admin_rpc_service;
|
pub mod admin_rpc_service;
|
||||||
@ -117,7 +117,7 @@ pub struct ProgressBar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ProgressBar {
|
impl ProgressBar {
|
||||||
pub fn set_message(&self, msg: &str) {
|
pub fn set_message<T: Into<Cow<'static, str>> + Display>(&self, msg: T) {
|
||||||
if self.is_term {
|
if self.is_term {
|
||||||
self.progress_bar.set_message(msg);
|
self.progress_bar.set_message(msg);
|
||||||
} else {
|
} else {
|
||||||
@ -125,7 +125,7 @@ impl ProgressBar {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn abandon_with_message(&self, msg: &str) {
|
pub fn abandon_with_message<T: Into<Cow<'static, str>> + Display>(&self, msg: T) {
|
||||||
if self.is_term {
|
if self.is_term {
|
||||||
self.progress_bar.abandon_with_message(msg);
|
self.progress_bar.abandon_with_message(msg);
|
||||||
} else {
|
} else {
|
||||||
|
@ -160,7 +160,7 @@ fn wait_for_restart_window(
|
|||||||
None => true,
|
None => true,
|
||||||
Some(current_epoch) => current_epoch != epoch_info.epoch,
|
Some(current_epoch) => current_epoch != epoch_info.epoch,
|
||||||
} {
|
} {
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"Fetching leader schedule for epoch {}...",
|
"Fetching leader schedule for epoch {}...",
|
||||||
epoch_info.epoch
|
epoch_info.epoch
|
||||||
));
|
));
|
||||||
@ -285,7 +285,7 @@ fn wait_for_restart_window(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
progress_bar.set_message(&format!(
|
progress_bar.set_message(format!(
|
||||||
"{} | Processed Slot: {} | Snapshot Slot: {} | {:.2}% delinquent stake | {}",
|
"{} | Processed Slot: {} | Snapshot Slot: {} | {:.2}% delinquent stake | {}",
|
||||||
{
|
{
|
||||||
let elapsed =
|
let elapsed =
|
||||||
|
Reference in New Issue
Block a user