From f89b3ce7d230ecd92e953db5216899c2c0a4308e Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Thu, 10 Oct 2024 12:59:51 -0600 Subject: [PATCH] Fix rustfmt and cargo vet errors. --- supply-chain/imports.lock | 7 +++++++ zcash_client_sqlite/src/wallet.rs | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index f30e75731..ada5729de 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -346,6 +346,13 @@ user-id = 169181 user-login = "nuttycom" user-name = "Kris Nuttycombe" +[[publisher.zip321]] +version = "0.2.0" +when = "2024-10-04" +user-id = 169181 +user-login = "nuttycom" +user-name = "Kris Nuttycombe" + [[audits.bytecode-alliance.wildcard-audits.bumpalo]] who = "Nick Fitzgerald " criteria = "safe-to-deploy" diff --git a/zcash_client_sqlite/src/wallet.rs b/zcash_client_sqlite/src/wallet.rs index 4ba7bb510..b4a29f294 100644 --- a/zcash_client_sqlite/src/wallet.rs +++ b/zcash_client_sqlite/src/wallet.rs @@ -852,9 +852,7 @@ fn table_constants( ORCHARD_SHARD_HEIGHT, )), #[cfg(not(feature = "orchard"))] - ShieldedProtocol::Orchard => { - Err(SqliteClientError::UnsupportedPoolType(PoolType::ORCHARD)) - } + ShieldedProtocol::Orchard => Err(SqliteClientError::UnsupportedPoolType(PoolType::ORCHARD)), } } @@ -912,7 +910,7 @@ fn estimate_tree_size( #[cfg(feature = "orchard")] ShieldedProtocol::Orchard => last_scanned.orchard_tree_size(), #[cfg(not(feature = "orchard"))] - ShieldedProtocol::Orchard => None + ShieldedProtocol::Orchard => None, } .map(|tree_size| (last_scanned.block_height(), u64::from(tree_size))) });