From 88905126aeb2d200c988d2541e32c9c022c3b4da Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Tue, 12 Sep 2023 13:37:57 +0200 Subject: [PATCH 1/5] Cleanup `ChannelId` re-export `ChannelId` was weirdly listed in the re-export section of the docs and reachable via multiple paths. Here we opt to make the `channel_id` module private and leave only the `ChannelId` struct itself exposed. --- lightning/src/ln/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lightning/src/ln/mod.rs b/lightning/src/ln/mod.rs index bacb9e86c79..824550eb3e9 100644 --- a/lightning/src/ln/mod.rs +++ b/lightning/src/ln/mod.rs @@ -13,7 +13,6 @@ #[macro_use] pub mod functional_test_utils; -pub mod channel_id; pub mod channelmanager; pub mod inbound_payment; pub mod msgs; @@ -21,6 +20,7 @@ pub mod peer_handler; pub mod chan_utils; pub mod features; pub mod script; +mod channel_id; #[cfg(fuzzing)] pub mod peer_channel_encryptor; @@ -33,7 +33,7 @@ pub mod channel; pub(crate) mod channel; // Re-export ChannelId -pub use self::channel_id::ChannelId; +pub use channel_id::ChannelId; pub(crate) mod onion_utils; mod outbound_payment; From 190867c37337f0efa37c208ea1a0abc5f9f87119 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Tue, 12 Sep 2023 13:44:41 +0200 Subject: [PATCH 2/5] Fix unused variable warning in `monitor_tests` --- lightning/src/ln/monitor_tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs index 4af0f41becf..ece24794f63 100644 --- a/lightning/src/ln/monitor_tests.rs +++ b/lightning/src/ln/monitor_tests.rs @@ -2231,7 +2231,7 @@ fn test_anchors_aggregated_revoked_htlc_tx() { assert!(nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_events().is_empty()); let spendable_output_events = nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_events(); assert_eq!(spendable_output_events.len(), 2); - for (idx, event) in spendable_output_events.iter().enumerate() { + for event in spendable_output_events.iter() { if let Event::SpendableOutputs { outputs, channel_id } = event { assert_eq!(outputs.len(), 1); assert!(vec![chan_b.2, chan_a.2].contains(&channel_id.unwrap())); From ba05f9b3f5af59a48895f7a321b022aa03f57788 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Tue, 12 Sep 2023 13:47:09 +0200 Subject: [PATCH 3/5] Fix warnings in `lightning-net-tokio` --- lightning-net-tokio/src/lib.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lightning-net-tokio/src/lib.rs b/lightning-net-tokio/src/lib.rs index 06aed3194f9..5527d85adf6 100644 --- a/lightning-net-tokio/src/lib.rs +++ b/lightning-net-tokio/src/lib.rs @@ -31,10 +31,9 @@ use bitcoin::secp256k1::PublicKey; -use tokio::net::{tcp, TcpStream}; -use tokio::{io, time}; +use tokio::net::TcpStream; +use tokio::time; use tokio::sync::mpsc; -use tokio::io::AsyncWrite; use lightning::ln::peer_handler; use lightning::ln::peer_handler::SocketDescriptor as LnSocketTrait; @@ -231,7 +230,7 @@ impl Connection { // readable() is allowed to spuriously wake, so we have to handle // WouldBlock here. }, - Err(e) => break Disconnect::PeerDisconnected, + Err(_) => break Disconnect::PeerDisconnected, } }, } @@ -493,10 +492,10 @@ impl peer_handler::SocketDescriptor for SocketDescriptor { written_len += res; if written_len == data.len() { return written_len; } }, - Err(e) => return written_len, + Err(_) => return written_len, } }, - task::Poll::Ready(Err(e)) => return written_len, + task::Poll::Ready(Err(_)) => return written_len, task::Poll::Pending => { // We're queued up for a write event now, but we need to make sure we also // pause read given we're now waiting on the remote end to ACK (and in From 9ee9809547f12d4f6c2487e0afb945c30ad4aafb Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Wed, 13 Sep 2023 09:42:56 +0200 Subject: [PATCH 4/5] Fix more unused warnings in `test_utils` --- lightning/src/util/test_utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs index 09c99815bb7..785b40befd4 100644 --- a/lightning/src/util/test_utils.rs +++ b/lightning/src/util/test_utils.rs @@ -427,7 +427,7 @@ impl chainmonitor::Persist fo } } -pub(crate) struct TestStore { +pub struct TestStore { persisted_bytes: Mutex>>>, read_only: bool, } From 411a3f7d768b76cb82b91e7eba97b832eec610ca Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Wed, 13 Sep 2023 09:49:02 +0200 Subject: [PATCH 5/5] Fix unused import warning in `shutdown_tests` --- lightning/src/ln/shutdown_tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightning/src/ln/shutdown_tests.rs b/lightning/src/ln/shutdown_tests.rs index 1310d25d476..f105edc19c0 100644 --- a/lightning/src/ln/shutdown_tests.rs +++ b/lightning/src/ln/shutdown_tests.rs @@ -11,7 +11,7 @@ use crate::sign::{EntropySource, SignerProvider}; use crate::chain::transaction::OutPoint; -use crate::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason}; +use crate::events::{MessageSendEvent, MessageSendEventsProvider, ClosureReason}; use crate::ln::channelmanager::{self, PaymentSendFailure, PaymentId, RecipientOnionFields, ChannelShutdownState, ChannelDetails}; use crate::routing::router::{PaymentParameters, get_route, RouteParameters}; use crate::ln::msgs;