diff --git a/src/commands/inspect/transaction.rs b/src/commands/inspect/transaction.rs index 2326d57..6224b7e 100644 --- a/src/commands/inspect/transaction.rs +++ b/src/commands/inspect/transaction.rs @@ -8,10 +8,11 @@ use group::GroupEncoding; use sapling::{note_encryption::SaplingDomain, SaplingVerificationContext}; use secp256k1::{Secp256k1, VerifyOnly}; +#[allow(deprecated)] +use ::transparent::keys::pubkey_to_address; use ::transparent::{ address::{Script, TransparentAddress}, bundle as transparent, - keys::pubkey_to_address, sighash::{SighashType, TransparentAuthorizingContext}, }; use orchard::note_encryption::OrchardDomain; diff --git a/src/commands/pczt/qr.rs b/src/commands/pczt/qr.rs index df61627..b3deb64 100644 --- a/src/commands/pczt/qr.rs +++ b/src/commands/pczt/qr.rs @@ -254,11 +254,8 @@ impl<'b, C> minicbor::Decode<'b, C> for ZcashPczt { cbor_map(d, &mut result, |key, obj, d| { let key = u8::try_from(key).map_err(|e| minicbor::decode::Error::message(e.to_string()))?; - match key { - DATA => { - obj.data = d.bytes()?.to_vec(); - } - _ => {} + if key == DATA { + obj.data = d.bytes()?.to_vec(); } Ok(()) })?; diff --git a/src/commands/wallet/sync/defrag.rs b/src/commands/wallet/sync/defrag.rs index ff35ef3..97432ef 100644 --- a/src/commands/wallet/sync/defrag.rs +++ b/src/commands/wallet/sync/defrag.rs @@ -246,7 +246,7 @@ impl App { // Determine the density of blocks we will be rendering. Use ceiling division // to ensure we don't require more cells than we have (which would cause the // blocks around the chain tip to never be rendered). - let area = u32::from(defrag_area.area()); + let area = defrag_area.area(); let blocks_per_cell = (block_count + area - 1) / area; let blocks_per_row = blocks_per_cell * u32::from(defrag_area.width);