From e017fb2c05ef66d0721eed208c9392790cda1c2d Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Mon, 27 May 2024 10:49:11 +0200 Subject: [PATCH] clippy fixes --- monero-harness/src/lib.rs | 2 +- monero-wallet/src/lib.rs | 2 +- swap/src/asb/event_loop.rs | 6 +++--- swap/src/bitcoin/redeem.rs | 4 ++-- swap/src/bitcoin/refund.rs | 4 ++-- swap/src/bitcoin/wallet.rs | 4 +--- swap/src/cli/event_loop.rs | 2 +- swap/src/network/cbor_request_response.rs | 2 +- swap/src/network/json_pull_codec.rs | 2 +- swap/src/network/test.rs | 2 +- 10 files changed, 14 insertions(+), 16 deletions(-) diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs index d5f8a513..61c12a27 100644 --- a/monero-harness/src/lib.rs +++ b/monero-harness/src/lib.rs @@ -225,7 +225,7 @@ impl<'c> Monerod { name: String, network: String, ) -> Result<(Self, Container<'c, image::Monerod>)> { - let image = image::Monerod::default(); + let image = image::Monerod; let image: RunnableImage = RunnableImage::from(image) .with_container_name(name.clone()) .with_network(network.clone()); diff --git a/monero-wallet/src/lib.rs b/monero-wallet/src/lib.rs index 080c2599..7f2928c3 100644 --- a/monero-wallet/src/lib.rs +++ b/monero-wallet/src/lib.rs @@ -65,7 +65,7 @@ mod tests { #[tokio::test] async fn get_outs_for_key_offsets() { let cli = Cli::default(); - let container = cli.run(Monerod::default()); + let container = cli.run(Monerod); let rpc_client = Client::localhost(container.get_host_port_ipv4(18081)).unwrap(); rpc_client.generateblocks(150, "498AVruCDWgP9Az9LjMm89VWjrBrSZ2W2K3HFBiyzzrRjUJWUcCVxvY1iitfuKoek2FdX6MKGAD9Qb1G1P8QgR5jPmmt3Vj".to_owned()).await.unwrap(); let wallet = Wallet { diff --git a/swap/src/asb/event_loop.rs b/swap/src/asb/event_loop.rs index 4083f130..0d6de9a7 100644 --- a/swap/src/asb/event_loop.rs +++ b/swap/src/asb/event_loop.rs @@ -279,10 +279,10 @@ where SwarmEvent::IncomingConnectionError { send_back_addr: address, error, .. } => { tracing::warn!(%address, "Failed to set up connection with peer: {:#}", error); } - SwarmEvent::ConnectionClosed { peer_id: peer, num_established, endpoint, cause: Some(error) } if num_established == 0 => { + SwarmEvent::ConnectionClosed { peer_id: peer, num_established: 0, endpoint, cause: Some(error) } => { tracing::debug!(%peer, address = %endpoint.get_remote_address(), "Lost connection to peer: {:#}", error); } - SwarmEvent::ConnectionClosed { peer_id: peer, num_established, endpoint, cause: None } if num_established == 0 => { + SwarmEvent::ConnectionClosed { peer_id: peer, num_established: 0, endpoint, cause: None } => { tracing::info!(%peer, address = %endpoint.get_remote_address(), "Successfully closed connection"); } SwarmEvent::NewListenAddr{address, ..} => { @@ -296,7 +296,7 @@ where Some(Ok((peer, transfer_proof, responder))) => { if !self.swarm.behaviour_mut().transfer_proof.is_connected(&peer) { tracing::warn!(%peer, "No active connection to peer, buffering transfer proof"); - self.buffered_transfer_proofs.entry(peer).or_insert_with(Vec::new).push((transfer_proof, responder)); + self.buffered_transfer_proofs.entry(peer).or_default().push((transfer_proof, responder)); continue; } diff --git a/swap/src/bitcoin/redeem.rs b/swap/src/bitcoin/redeem.rs index f1d649ae..a6a55e4b 100644 --- a/swap/src/bitcoin/redeem.rs +++ b/swap/src/bitcoin/redeem.rs @@ -124,7 +124,7 @@ impl TxRedeem { let input = match candidate_transaction.input.as_slice() { [input] => input, [] => bail!(NoInputs), - [inputs @ ..] => bail!(TooManyInputs(inputs.len())), + inputs => bail!(TooManyInputs(inputs.len())), }; let sigs = match input.witness.to_vec().as_slice() { @@ -133,7 +133,7 @@ impl TxRedeem { .map(|sig| extract_ecdsa_sig(sig)) .collect::, _>>(), [] => bail!(EmptyWitnessStack), - [witnesses @ ..] => bail!(NotThreeWitnesses(witnesses.len())), + witnesses => bail!(NotThreeWitnesses(witnesses.len())), }?; let sig = sigs diff --git a/swap/src/bitcoin/refund.rs b/swap/src/bitcoin/refund.rs index 8f2bca3d..ec9fc802 100644 --- a/swap/src/bitcoin/refund.rs +++ b/swap/src/bitcoin/refund.rs @@ -131,7 +131,7 @@ impl TxRefund { let input = match candidate_transaction.input.as_slice() { [input] => input, [] => bail!(NoInputs), - [inputs @ ..] => bail!(TooManyInputs(inputs.len())), + inputs => bail!(TooManyInputs(inputs.len())), }; let sigs = match input.witness.to_vec().as_slice() { @@ -140,7 +140,7 @@ impl TxRefund { .map(|sig| extract_ecdsa_sig(sig)) .collect::, _>>(), [] => bail!(EmptyWitnessStack), - [witnesses @ ..] => bail!(NotThreeWitnesses(witnesses.len())), + witnesses => bail!(NotThreeWitnesses(witnesses.len())), }?; let sig = sigs diff --git a/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs index 5d8685f3..9748d740 100644 --- a/swap/src/bitcoin/wallet.rs +++ b/swap/src/bitcoin/wallet.rs @@ -65,9 +65,7 @@ impl Wallet { database, ) { Ok(w) => w, - Err(e) if matches!(e, bdk::Error::ChecksumMismatch) => { - Self::migrate(data_dir, xprivkey, network)? - } + Err(bdk::Error::ChecksumMismatch) => Self::migrate(data_dir, xprivkey, network)?, err => err?, }; diff --git a/swap/src/cli/event_loop.rs b/swap/src/cli/event_loop.rs index 23aa0f38..befe1dc5 100644 --- a/swap/src/cli/event_loop.rs +++ b/swap/src/cli/event_loop.rs @@ -168,7 +168,7 @@ impl EventLoop { tracing::info!("Successfully closed connection to Alice"); return; } - SwarmEvent::OutgoingConnectionError { peer_id, error } if matches!(peer_id, Some(alice_peer_id) if alice_peer_id == self.alice_peer_id) => { + SwarmEvent::OutgoingConnectionError { peer_id: Some(alice_peer_id), error } if alice_peer_id == self.alice_peer_id => { tracing::warn!(%error, "Failed to dial Alice"); if let Some(duration) = self.swarm.behaviour_mut().redial.until_next_redial() { diff --git a/swap/src/network/cbor_request_response.rs b/swap/src/network/cbor_request_response.rs index 18e193ee..634dd729 100644 --- a/swap/src/network/cbor_request_response.rs +++ b/swap/src/network/cbor_request_response.rs @@ -19,7 +19,7 @@ pub struct CborCodec { impl Default for CborCodec { fn default() -> Self { Self { - phantom: PhantomData::default(), + phantom: PhantomData, } } } diff --git a/swap/src/network/json_pull_codec.rs b/swap/src/network/json_pull_codec.rs index bf473e84..01fcf494 100644 --- a/swap/src/network/json_pull_codec.rs +++ b/swap/src/network/json_pull_codec.rs @@ -25,7 +25,7 @@ pub struct JsonPullCodec { impl Default for JsonPullCodec { fn default() -> Self { Self { - phantom: PhantomData::default(), + phantom: PhantomData, } } } diff --git a/swap/src/network/test.rs b/swap/src/network/test.rs index a5c316b1..5a324385 100644 --- a/swap/src/network/test.rs +++ b/swap/src/network/test.rs @@ -40,7 +40,7 @@ where .expect("failed to create dh_keys"); let noise = NoiseConfig::xx(dh_keys).into_authenticated(); - let transport = MemoryTransport::default() + let transport = MemoryTransport .or_transport(TokioTcpConfig::new()) .upgrade(Version::V1) .authenticate(noise)