Re-add crossbeam to use its select! functionality

This partially reverts commit 6ba2487.

Author: MaxFangX

lightning-net/Cargo.toml

@@ -19,4 +19,4 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 bitcoin = { version = "0.27", default-features = false }
 lightning = { version = "0.0.106", path = "../lightning" }
-crossbeam-channel = "0.5.4"
+crossbeam = "0.8.1"

lightning-net/src/lib.rs

@@ -61,7 +61,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use std::thread::{self, JoinHandle};
 
-use crossbeam_channel::{Receiver, Sender, TryRecvError, TrySendError};
+use crossbeam::channel::{Receiver, Sender, TryRecvError, TrySendError};
 
 use bitcoin::secp256k1::key::PublicKey;
 use lightning::ln::msgs::{ChannelMessageHandler, NetAddress, RoutingMessageHandler};
@@ -272,9 +272,9 @@ fn init_channels() -> (
     Sender<WriterCommand>,
     Receiver<WriterCommand>,
 ) {
-    let (reader_cmd_tx, reader_cmd_rx) = crossbeam_channel::unbounded();
+    let (reader_cmd_tx, reader_cmd_rx) = crossbeam::channel::unbounded();
 
-    let (writer_cmd_tx, writer_cmd_rx) = crossbeam_channel::bounded(2);
+    let (writer_cmd_tx, writer_cmd_rx) = crossbeam::channel::bounded(2);
 
     (reader_cmd_tx, reader_cmd_rx, writer_cmd_tx, writer_cmd_rx)
 }
@@ -883,6 +883,8 @@ mod tests {
     use super::handle_connection;
     use super::ConnectionType::*;
 
+    use crossbeam::channel;
+
     use std::mem;
     use std::net::{TcpListener, TcpStream};
     use std::sync::atomic::{AtomicBool, Ordering};
@@ -907,8 +909,8 @@ mod tests {
     /// connected (and disconnected)
     struct MsgHandler {
         expected_pubkey: PublicKey,
-        connected_tx: crossbeam_channel::Sender<()>,
-        disconnected_tx: crossbeam_channel::Sender<()>,
+        connected_tx: channel::Sender<()>,
+        disconnected_tx: channel::Sender<()>,
         disconnected_flag: AtomicBool,
         msg_events: Mutex<Vec<MessageSendEvent>>,
     }
@@ -1059,8 +1061,8 @@ mod tests {
         let b_pub = PublicKey::from_secret_key(&secp_ctx, &b_key);
 
         // Initialize node A
-        let (a_connected_tx, a_connected_rx) = crossbeam_channel::bounded(1);
-        let (a_disconnected_tx, a_disconnected_rx) = crossbeam_channel::bounded(1);
+        let (a_connected_tx, a_connected_rx) = channel::bounded(1);
+        let (a_disconnected_tx, a_disconnected_rx) = channel::bounded(1);
         let a_handler = Arc::new(MsgHandler {
             expected_pubkey: b_pub,
             connected_tx: a_connected_tx,
@@ -1080,8 +1082,8 @@ mod tests {
         ));
 
         // Initialize node B
-        let (b_connected_tx, b_connected_rx) = crossbeam_channel::bounded(1);
-        let (b_disconnected_tx, b_disconnected_rx) = crossbeam_channel::bounded(1);
+        let (b_connected_tx, b_connected_rx) = channel::bounded(1);
+        let (b_disconnected_tx, b_disconnected_rx) = channel::bounded(1);
         let b_handler = Arc::new(MsgHandler {
             expected_pubkey: a_pub,
             connected_tx: b_connected_tx,