Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to 1.81 toolchain #1374

Merged
merged 1 commit into from
Sep 10, 2024
Merged

update to 1.81 toolchain #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.79"
channel = "1.81"
components = [ "clippy", "rustfmt" ]
6 changes: 3 additions & 3 deletions zingocli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ fn short_circuit_on_help(params: Vec<String>) {
/// * 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<Self, String> {
let is_regtest = matches.get_flag("regtest"); // Begin short_circuit section
Expand Down
2 changes: 1 addition & 1 deletion zingolib/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions zingolib/src/testutils/assertions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<NoteId>(
client: &LightClient,
proposal: &Proposal<zcash_primitives::transaction::fees::zip317::FeeRule, NoteId>,
Expand Down
2 changes: 1 addition & 1 deletion zingolib/src/testutils/chain_generics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//! darkside known issues:
//! - transparent
//! - txids

//!
//! libtonode known issues:
//! - mempool

Expand Down
Loading