diff --git a/src/rust/src/address_ffi.rs b/src/rust/src/address_ffi.rs index e0bc66ba0..6694e25b8 100644 --- a/src/rust/src/address_ffi.rs +++ b/src/rust/src/address_ffi.rs @@ -50,7 +50,7 @@ impl FromAddress for UnifiedAddressHelper { } impl UnifiedAddressHelper { - fn to_cpp( + fn into_cpp( self, network: Network, ua_obj: Option, @@ -145,7 +145,7 @@ pub extern "C" fn zcash_address_parse_unified( } }; - ua.to_cpp(network, ua_obj, sapling_cb, p2sh_cb, p2pkh_cb, unknown_cb) + ua.into_cpp(network, ua_obj, sapling_cb, p2sh_cb, p2pkh_cb, unknown_cb) } #[no_mangle] diff --git a/src/rust/src/history_ffi.rs b/src/rust/src/history_ffi.rs index d815de501..f132de9d3 100644 --- a/src/rust/src/history_ffi.rs +++ b/src/rust/src/history_ffi.rs @@ -88,6 +88,7 @@ pub extern "system" fn librustzcash_mmr_append( ) } +#[allow(clippy::too_many_arguments)] fn librustzcash_mmr_append_inner( // Consensus branch id cbranch: u32, diff --git a/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs b/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs index 9a2468a82..74c5552ed 100644 --- a/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs +++ b/src/rust/src/orchard_ffi/incremental_sinsemilla_tree_ffi.rs @@ -2,8 +2,6 @@ use incrementalmerkletree::{ bridgetree::{self, BridgeTree}, Altitude, Frontier, Hashable, Tree, }; -use std::convert::TryFrom; -use std::io; use std::mem::size_of_val; use std::ptr; @@ -55,14 +53,7 @@ pub extern "C" fn orchard_merkle_frontier_parse( ) -> *mut bridgetree::Frontier { let reader = CppStreamReader::from_raw_parts(stream, read_cb.unwrap()); - match read_frontier_v1(reader).and_then(|nf| { - bridgetree::Frontier::try_from(nf).map_err(|e| { - io::Error::new( - io::ErrorKind::InvalidInput, - format!("Parsing resulted in an invalid Merkle frontier: {:?}", e), - ) - }) - }) { + match read_frontier_v1(reader) { Ok(parsed) => Box::into_raw(Box::new(parsed)), Err(e) => { error!("Failed to parse Orchard bundle: {}", e); diff --git a/src/rust/src/rustzcash.rs b/src/rust/src/rustzcash.rs index cc5e1f232..c4b1e6125 100644 --- a/src/rust/src/rustzcash.rs +++ b/src/rust/src/rustzcash.rs @@ -946,10 +946,7 @@ pub extern "C" fn librustzcash_sapling_spend_proof( }; // Construct the proof generation key - let proof_generation_key = ProofGenerationKey { - ak: ak.clone(), - nsk, - }; + let proof_generation_key = ProofGenerationKey { ak, nsk }; // Grab the diversifier from the caller let diversifier = Diversifier(unsafe { *diversifier }); diff --git a/src/rust/src/tests/key_agreement.rs b/src/rust/src/tests/key_agreement.rs index 5d80ac188..cb1044f5a 100644 --- a/src/rust/src/tests/key_agreement.rs +++ b/src/rust/src/tests/key_agreement.rs @@ -21,9 +21,8 @@ fn test_key_agreement() { let addr = loop { let mut d = [0; 11]; rng.fill_bytes(&mut d); - match vk.to_payment_address(Diversifier(d)) { - Some(a) => break a, - None => {} + if let Some(a) = vk.to_payment_address(Diversifier(d)) { + break a; } }; diff --git a/src/rust/src/tests/signatures.rs b/src/rust/src/tests/signatures.rs index cd5dd7d12..028e3a016 100644 --- a/src/rust/src/tests/signatures.rs +++ b/src/rust/src/tests/signatures.rs @@ -491,7 +491,7 @@ fn redjubjub_signatures() { { let mut vec = Vec::new(); - sk.randomize(alpha.clone()).write(&mut vec).unwrap(); + sk.randomize(alpha).write(&mut vec).unwrap(); assert_eq!(&vec, &tv.rsk); } {