From 0e99d02fbe7ff611860c8fd7f0711a864ea98b5d Mon Sep 17 00:00:00 2001 From: Tobin Harding Date: Wed, 23 Dec 2020 13:42:52 +1100 Subject: [PATCH] Remove redundant calls to clone No need to clone copy types, found by clippy. --- src/database/mod.rs | 4 ++-- src/descriptor/dsl.rs | 15 ++++++--------- src/wallet/coin_selection.rs | 2 +- src/wallet/tx_builder.rs | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/database/mod.rs b/src/database/mod.rs index 33ec7ccf..ad2b90d8 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -227,7 +227,7 @@ pub mod test { ); assert_eq!( tree.get_path_from_script_pubkey(&script).unwrap(), - Some((keychain, path.clone())) + Some((keychain, path)) ); } @@ -256,7 +256,7 @@ pub mod test { ); assert_eq!( tree.get_path_from_script_pubkey(&script).unwrap(), - Some((keychain, path.clone())) + Some((keychain, path)) ); } diff --git a/src/descriptor/dsl.rs b/src/descriptor/dsl.rs index 37e9a1a4..b3f62ae5 100644 --- a/src/descriptor/dsl.rs +++ b/src/descriptor/dsl.rs @@ -968,7 +968,7 @@ mod test { fn test_valid_networks() { let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap(); let path = bip32::DerivationPath::from_str("m/0").unwrap(); - let desc_key = (xprv, path.clone()).into_descriptor_key().unwrap(); + let desc_key = (xprv, path).into_descriptor_key().unwrap(); let (_desc, _key_map, valid_networks) = descriptor!(pkh(desc_key)).unwrap(); assert_eq!( @@ -978,7 +978,7 @@ mod test { let xprv = bip32::ExtendedPrivKey::from_str("xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi").unwrap(); let path = bip32::DerivationPath::from_str("m/10/20/30/40").unwrap(); - let desc_key = (xprv, path.clone()).into_descriptor_key().unwrap(); + let desc_key = (xprv, path).into_descriptor_key().unwrap(); let (_desc, _key_map, valid_networks) = descriptor!(wpkh(desc_key)).unwrap(); assert_eq!(valid_networks, [Bitcoin].iter().cloned().collect()); @@ -1005,12 +1005,9 @@ mod test { descriptor!(sh(wsh(multi(2, desc_key1, desc_key2, desc_key3)))).unwrap(); assert_eq!(key_map.len(), 3); - let desc_key1: DescriptorKey = - (xprv1, path1.clone()).into_descriptor_key().unwrap(); - let desc_key2: DescriptorKey = - (xprv2, path2.clone()).into_descriptor_key().unwrap(); - let desc_key3: DescriptorKey = - (xprv3, path3.clone()).into_descriptor_key().unwrap(); + let desc_key1: DescriptorKey = (xprv1, path1).into_descriptor_key().unwrap(); + let desc_key2: DescriptorKey = (xprv2, path2).into_descriptor_key().unwrap(); + let desc_key3: DescriptorKey = (xprv3, path3).into_descriptor_key().unwrap(); let (key1, _key_map, _valid_networks) = desc_key1.extract(&secp).unwrap(); let (key2, _key_map, _valid_networks) = desc_key2.extract(&secp).unwrap(); @@ -1026,7 +1023,7 @@ mod test { // this compiles let xprv = bip32::ExtendedPrivKey::from_str("tprv8ZgxMBicQKsPcx5nBGsR63Pe8KnRUqmbJNENAfGftF3yuXoMMoVJJcYeUw5eVkm9WBPjWYt6HMWYJNesB5HaNVBaFc1M6dRjWSYnmewUMYy").unwrap(); let path = bip32::DerivationPath::from_str("m/0").unwrap(); - let desc_key: DescriptorKey = (xprv, path.clone()).into_descriptor_key().unwrap(); + let desc_key: DescriptorKey = (xprv, path).into_descriptor_key().unwrap(); let (desc, _key_map, _valid_networks) = descriptor!(pkh(desc_key)).unwrap(); assert_eq!(desc.to_string(), "pkh(tpubD6NzVbkrYhZ4WR7a4vY1VT3khMJMeAxVsfq9TBJyJWrNk247zCJtV7AWf6UJP7rAVsn8NNKdJi3gFyKPTmWZS9iukb91xbn2HbFSMQm2igY/0/*)#yrnz9pp2"); diff --git a/src/wallet/coin_selection.rs b/src/wallet/coin_selection.rs index c57f251d..9e1b90c3 100644 --- a/src/wallet/coin_selection.rs +++ b/src/wallet/coin_selection.rs @@ -804,7 +804,7 @@ mod test { .coin_select( &database, vec![], - utxos.clone(), + utxos, FeeRate::from_sat_per_vb(1.0), 99932, // first utxo's effective value 0.0, diff --git a/src/wallet/tx_builder.rs b/src/wallet/tx_builder.rs index d4ba8a4e..35c7d073 100644 --- a/src/wallet/tx_builder.rs +++ b/src/wallet/tx_builder.rs @@ -678,7 +678,7 @@ mod test { use std::str::FromStr; let original_tx = ordering_test_tx!(); - let mut tx = original_tx.clone(); + let mut tx = original_tx; TxOrdering::BIP69Lexicographic.sort_tx(&mut tx);