diff --git a/rust-toolchain.toml b/rust-toolchain.toml index eac7f1c41..08d4d36c0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.79" +channel = "1.81" components = [ "clippy", "rustfmt" ] diff --git a/zingocli/src/lib.rs b/zingocli/src/lib.rs index 5f02fbb81..23c0f9a2e 100644 --- a/zingocli/src/lib.rs +++ b/zingocli/src/lib.rs @@ -276,9 +276,9 @@ fn short_circuit_on_help(params: Vec) { /// * behave correctly as a function of each parameter that may have been passed /// * add details of above here /// * handle parameters as efficiently as possible. -/// * If a ShortCircuitCommand -/// is specified, then the system should execute only logic necessary to support that command, -/// in other words "help" the ShortCircuitCommand _MUST_ not launch either zcashd or lightwalletd +/// * If a ShortCircuitCommand is specified, then the system should execute +/// only logic necessary to support that command, in other words "help" +/// the ShortCircuitCommand _MUST_ not launch either zcashd or lightwalletd impl ConfigTemplate { fn fill(matches: clap::ArgMatches) -> Result { let is_regtest = matches.get_flag("regtest"); // Begin short_circuit section diff --git a/zingolib/src/config.rs b/zingolib/src/config.rs index ee3687495..88d9293a9 100644 --- a/zingolib/src/config.rs +++ b/zingolib/src/config.rs @@ -459,7 +459,7 @@ impl ZingoConfig { use std::time::{SystemTime, UNIX_EPOCH}; let mut backup_file_path = self.get_zingo_wallet_dir().into_path_buf(); - backup_file_path.push(&format!( + backup_file_path.push(format!( "zingo-wallet.backup.{}.dat", SystemTime::now() .duration_since(UNIX_EPOCH) diff --git a/zingolib/src/testutils/assertions.rs b/zingolib/src/testutils/assertions.rs index 58ac7fa04..d37424fa3 100644 --- a/zingolib/src/testutils/assertions.rs +++ b/zingolib/src/testutils/assertions.rs @@ -12,8 +12,9 @@ use zingo_status::confirmation_status::ConfirmationStatus; /// 1. len of txids == num steps /// 2. the txid is stored in the records_by_ids database /// 3. if the fee from the calculate_transaction_fee matches the sum of the per-step fees -/// this currently fails for any broadcast but not confirmed transaction: it seems like get_transaction_fee does not recognize pending spends -/// returns the total fee for the transfer +/// this currently fails for any broadcast but not confirmed transaction: it seems like +/// get_transaction_fee does not recognize pending spends returns the total fee for the +/// transfer pub async fn assert_record_fee_and_status( client: &LightClient, proposal: &Proposal, diff --git a/zingolib/src/testutils/chain_generics.rs b/zingolib/src/testutils/chain_generics.rs index 5359bbc95..3ae89cc39 100644 --- a/zingolib/src/testutils/chain_generics.rs +++ b/zingolib/src/testutils/chain_generics.rs @@ -6,7 +6,7 @@ //! darkside known issues: //! - transparent //! - txids - +//! //! libtonode known issues: //! - mempool