Merge pull request #2954 from TheBlueMatt/2024-03-test-ci-beta-fail

Fix new warnings causing CI build failures on rustc beta

Author: tnull

lightning-block-sync/src/init.rs

@@ -252,8 +252,6 @@ mod tests {
 	use crate::test_utils::{Blockchain, MockChainListener};
 	use super::*;
 
-	use bitcoin::network::constants::Network;
-
 	#[tokio::test]
 	async fn sync_from_same_chain() {
 		let chain = Blockchain::default().with_height(4);

lightning-invoice/src/de.rs

@@ -1,5 +1,6 @@
 #[cfg(feature = "std")]
 use std::error;
+#[cfg(not(feature = "std"))]
 use core::convert::TryFrom;
 use core::fmt;
 use core::fmt::{Display, Formatter};

lightning-invoice/src/utils.rs

@@ -19,6 +19,7 @@ use secp256k1::PublicKey;
 use alloc::collections::{btree_map, BTreeMap};
 use core::ops::Deref;
 use core::time::Duration;
+#[cfg(not(feature = "std"))]
 use core::iter::Iterator;
 
 /// Utility to create an invoice that can be paid to one of multiple nodes, or a "phantom invoice."

lightning-invoice/tests/ser_de.rs

@@ -8,9 +8,6 @@ use bitcoin::address::WitnessVersion;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::hashes::hex::FromHex;
 use bitcoin::hashes::{sha256, Hash};
-use lightning::ln::PaymentSecret;
-use lightning::routing::gossip::RoutingFees;
-use lightning::routing::router::{RouteHint, RouteHintHop};
 use lightning_invoice::*;
 use secp256k1::PublicKey;
 use secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

lightning-net-tokio/src/lib.rs

@@ -208,7 +208,12 @@ impl Connection {
 						break Disconnect::CloseConnection;
 					}
 				},
-				SelectorOutput::B(_) => {},
+				SelectorOutput::B(some) => {
+					// The mpsc Receiver should only return `None` if the write side has been
+					// dropped, but that shouldn't be possible since its referenced by the Self in
+					// `us`.
+					debug_assert!(some.is_some());
+				},
 				SelectorOutput::C(res) => {
 					if res.is_err() { break Disconnect::PeerDisconnected; }
 					match reader.try_read(&mut buf) {
@@ -556,7 +561,6 @@ mod tests {
 	use lightning::ln::features::*;
 	use lightning::ln::msgs::*;
 	use lightning::ln::peer_handler::{MessageHandler, PeerManager};
-	use lightning::ln::features::NodeFeatures;
 	use lightning::routing::gossip::NodeId;
 	use lightning::events::*;
 	use lightning::util::test_utils::TestNodeSigner;

lightning-persister/src/fs_store.rs

@@ -379,7 +379,6 @@ mod tests {
 	use lightning::ln::functional_test_utils::*;
 	use lightning::util::test_utils;
 	use lightning::util::persist::read_channel_monitors;
-	use std::fs;
 	use std::str::FromStr;
 
 	impl Drop for FilesystemStore {

lightning-rapid-gossip-sync/src/processing.rs

@@ -19,7 +19,7 @@ use crate::{GraphSyncError, RapidGossipSync};
 #[cfg(all(feature = "std", not(test)))]
 use std::time::{SystemTime, UNIX_EPOCH};
 
-#[cfg(not(feature = "std"))]
+#[cfg(all(not(feature = "std"), not(test)))]
 use alloc::{vec::Vec, borrow::ToOwned};
 
 /// The purpose of this prefix is to identify the serialization format, should other rapid gossip

lightning/src/blinded_path/message.rs

@@ -1,12 +1,14 @@
 use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey};
 
+#[allow(unused_imports)]
+use crate::prelude::*;
+
 use crate::blinded_path::{BlindedHop, BlindedPath};
 use crate::blinded_path::utils;
 use crate::io;
 use crate::io::Cursor;
 use crate::ln::onion_utils;
 use crate::onion_message::packet::ControlTlvs;
-use crate::prelude::*;
 use crate::sign::{NodeSigner, Recipient};
 use crate::crypto::streams::ChaChaPolyReadAdapter;
 use crate::util::ser::{FixedLengthReader, LengthReadableArgs, Writeable, Writer};

lightning/src/blinded_path/payment.rs

@@ -12,10 +12,10 @@ use crate::ln::channelmanager::CounterpartyForwardingInfo;
 use crate::ln::features::BlindedHopFeatures;
 use crate::ln::msgs::DecodeError;
 use crate::offers::invoice::BlindedPayInfo;
-use crate::prelude::*;
 use crate::util::ser::{HighZeroBytesDroppedBigSize, Readable, Writeable, Writer};
 
-use core::convert::TryFrom;
+#[allow(unused_imports)]
+use crate::prelude::*;
 
 /// An intermediate node, its outbound channel, and relay parameters.
 #[derive(Clone, Debug)]

lightning/src/blinded_path/utils.rs

@@ -23,6 +23,8 @@ use crate::crypto::streams::ChaChaPolyWriteAdapter;
 use crate::util::ser::{Readable, Writeable};
 
 use crate::io;
+
+#[allow(unused_imports)]
 use crate::prelude::*;
 
 // TODO: DRY with onion_utils::construct_onion_keys_callback