Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 054e4f7

Browse files
committed
Fix issues building against solana 1.8
1 parent 902ca60 commit 054e4f7

File tree

4 files changed

+35
-5
lines changed

4 files changed

+35
-5
lines changed

Cargo.lock

Lines changed: 22 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

token/cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ version = "2.0.14"
1111
[dependencies]
1212
clap = "2.33.3"
1313
console = "0.14.0"
14+
indicatif = "0.16.2"
1415
serde = "1.0.130"
1516
serde_derive = "1.0.103"
1617
serde_json = "1.0.67"

token/cli/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![allow(deprecated)] // TODO: Remove when SPL upgrades to Solana 1.8
12
use clap::{
23
crate_description, crate_name, crate_version, value_t, value_t_or_exit, App, AppSettings, Arg,
34
ArgMatches, SubCommand,

token/cli/src/rpc_client_utils.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// TODO: In v1.8 timeframe delete this module and use `send_and_confirm_messages_with_spinner()`
22
// from the Solana monorepo
33
use {
4-
solana_cli_output::display::new_spinner_progress_bar,
54
solana_client::{
65
rpc_client::RpcClient,
76
rpc_config::RpcSendTransactionConfig,
@@ -18,6 +17,16 @@ use {
1817
std::{collections::HashMap, error, sync::Arc, thread::sleep, time::Duration},
1918
};
2019

20+
/// TODO: In v1.8 timeframe switch to using `solana_cli_output::display::new_spinner_progress_bar()`
21+
fn new_spinner_progress_bar() -> indicatif::ProgressBar {
22+
let progress_bar = indicatif::ProgressBar::new(42);
23+
progress_bar.set_style(
24+
indicatif::ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"),
25+
);
26+
progress_bar.enable_steady_tick(100);
27+
progress_bar
28+
}
29+
2130
pub fn send_and_confirm_messages_with_spinner<T: Signers>(
2231
rpc_client: Arc<RpcClient>,
2332
websocket_url: &str,
@@ -43,7 +52,7 @@ pub fn send_and_confirm_messages_with_spinner<T: Signers>(
4352
let mut transaction_errors = vec![None; messages.len()];
4453
let set_message =
4554
|confirmed_transactions, block_height: u64, last_valid_block_height: u64, status: &str| {
46-
progress_bar.set_message(&format!(
55+
progress_bar.set_message(format!(
4756
"{:>5.1}% | {:<40}[block height {}; block hash valid for {} blocks]",
4857
confirmed_transactions as f64 * 100. / messages.len() as f64,
4958
status,

0 commit comments

Comments
 (0)