Revert "net/acceptor: replace Mutex<Option<Weak<Session>>> with LazyWeak<Session>"

This reverts commit 34fc8fbd8f8d8d27bb7778d8e5d981acd0c6fd49.

src/net/acceptor.rs

@@ -19,16 +19,16 @@
 use std::sync::Arc;
 
 use log::error;
-use smol::Executor;
+use smol::{lock::Mutex, Executor};
 use url::Url;
 
 use super::{
     channel::{Channel, ChannelPtr},
-    session::SessionWeakPtr2,
+    session::SessionWeakPtr,
     transport::{Listener, PtListener},
 };
 use crate::{
-    system::{LazyWeak, StoppableTask, StoppableTaskPtr, Subscriber, SubscriberPtr, Subscription},
+    system::{StoppableTask, StoppableTaskPtr, Subscriber, SubscriberPtr, Subscription},
     Error, Result,
 };
 
@@ -39,7 +39,7 @@ pub type AcceptorPtr = Arc<Acceptor>;
 pub struct Acceptor {
     channel_subscriber: SubscriberPtr<Result<ChannelPtr>>,
     task: StoppableTaskPtr,
-    pub(in crate::net) session: SessionWeakPtr2,
+    pub session: Mutex<Option<SessionWeakPtr>>,
 }
 
 impl Acceptor {
@@ -48,7 +48,7 @@ impl Acceptor {
         Arc::new(Self {
             channel_subscriber: Subscriber::new(),
             task: StoppableTask::new(),
-            session: LazyWeak::new(),
+            session: Mutex::new(None),
         })
     }
 
@@ -86,8 +86,7 @@ impl Acceptor {
         loop {
             match listener.next().await {
                 Ok((stream, url)) => {
-                    let session = self.session.upgrade();
-                    let session = Arc::downgrade(&session);
+                    let session = self.session.lock().await.clone().unwrap();
                     let channel = Channel::new(stream, url, session).await;
                     self.channel_subscriber.notify(Ok(channel)).await;
                 }

src/net/session/inbound_session.rs

@@ -118,7 +118,8 @@ impl InboundSession {
         info!(target: "net::inbound_session", "[P2P] Starting Inbound session #{} on {}", index, accept_addr);
         // Generate a new acceptor for this inbound session
         let acceptor = Acceptor::new();
-        acceptor.session.init(self.clone());
+        let parent = Arc::downgrade(&self);
+        *acceptor.session.lock().await = Some(parent);
 
         // Start listener
         let result = acceptor.clone().start(accept_addr, ex).await;

src/net/session/mod.rs

@@ -23,7 +23,7 @@ use log::debug;
 use smol::Executor;
 
 use super::{channel::ChannelPtr, p2p::P2pPtr, protocol::ProtocolVersion};
-use crate::{system::LazyWeak, Result};
+use crate::Result;
 
 pub mod inbound_session;
 pub use inbound_session::{InboundSession, InboundSessionPtr};
@@ -43,7 +43,6 @@ pub const SESSION_SEED: SessionBitFlag = 0b1000;
 pub const SESSION_ALL: SessionBitFlag = 0b1111;
 
 pub type SessionWeakPtr = Weak<dyn Session + Send + Sync + 'static>;
-pub type SessionWeakPtr2 = LazyWeak<dyn Session + Send + Sync + 'static>;
 
 /// Removes channel from the list of connected channels when a stop signal
 /// is received.

src/system/lazy_weak.rs

@@ -71,9 +71,9 @@ use std::sync::{Arc, OnceLock, Weak};
 ///     }
 /// }
 /// ```
-pub struct LazyWeak<Parent: ?Sized>(OnceLock<Weak<Parent>>);
+pub struct LazyWeak<Parent>(OnceLock<Weak<Parent>>);
 
-impl<Parent: ?Sized> LazyWeak<Parent> {
+impl<Parent> LazyWeak<Parent> {
     /// Create an empty `LazyWeak`, which must immediately be followed by `weak.init()`.
     pub fn new() -> Self {
         Self(OnceLock::new())