From b3cd8d9fbc42cc96afe8ec1a50fe83749e1976ee Mon Sep 17 00:00:00 2001 From: Oscar Pepper Date: Mon, 1 Apr 2024 17:15:06 +0100 Subject: [PATCH 1/3] Removed unused struct --- zingolib/src/wallet/data.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/zingolib/src/wallet/data.rs b/zingolib/src/wallet/data.rs index be572e5b0..7907d25ad 100644 --- a/zingolib/src/wallet/data.rs +++ b/zingolib/src/wallet/data.rs @@ -577,8 +577,6 @@ pub mod finsight { } } pub mod summaries { - use std::collections::HashMap; - use json::{object, JsonValue}; use zcash_primitives::transaction::TxId; @@ -701,8 +699,6 @@ pub mod summaries { } } } - - pub struct TransactionIndex(HashMap); } pub use crate::wallet::transaction_record::TransactionRecord; From e27aa7765dd5eb15a9f6320bd5c661436e33277b Mon Sep 17 00:00:00 2001 From: Oscar Pepper Date: Mon, 1 Apr 2024 18:23:04 +0100 Subject: [PATCH 2/3] Better error handling for zingocli --- zingocli/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zingocli/src/lib.rs b/zingocli/src/lib.rs index 662be73eb..34b8d8f8a 100644 --- a/zingocli/src/lib.rs +++ b/zingocli/src/lib.rs @@ -523,6 +523,8 @@ pub fn run_cli() { if let Err(e) = LightClient::init_logging() { eprintln!("Could not initialize logging: {e}") }; - let cli_config = ConfigTemplate::fill(build_clap_app()).unwrap(); - dispatch_command_or_start_interactive(&cli_config); + match ConfigTemplate::fill(build_clap_app()) { + Ok(cli_config) => dispatch_command_or_start_interactive(&cli_config), + Err(e) => eprintln!("Error filling config template: {e:?}"), + } } From a1a68e789e8d648958f407f709f586d9db2cc8aa Mon Sep 17 00:00:00 2001 From: Oscar Pepper Date: Mon, 1 Apr 2024 18:47:27 +0100 Subject: [PATCH 3/3] Fixed toolchain in CI --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1b97090fe..2d15e553f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: stable + toolchain: 1.76.0 - name: Install nextest uses: taiki-e/install-action@nextest