refactor: passive relay start command

Author: jpraynaud

mithril-relay/src/commands/passive.rs

@@ -23,7 +23,7 @@ impl PassiveCommand {
         let dial_to = self.dial_to.to_owned();
         let addr: Multiaddr = format!("/ip4/0.0.0.0/tcp/{}", self.listen_port).parse()?;
 
-        let mut relay = PassiveRelay::new(&addr).start().await?;
+        let mut relay = PassiveRelay::start(&addr).await?;
         if let Some(dial_to_address) = dial_to {
             relay.dial_peer(dial_to_address.clone())?;
         }

mithril-relay/src/relay/passive.rs

@@ -11,19 +11,11 @@ pub struct PassiveRelay {
 }
 
 impl PassiveRelay {
-    /// Create a passive relay
-    /// TODO: should be replaced by Self::start(...)
-    pub fn new(addr: &Multiaddr) -> Self {
-        Self {
-            peer: Peer::new(addr),
-        }
-    }
-
     /// Start a passive relay
-    pub async fn start(self) -> StdResult<Self> {
+    pub async fn start(addr: &Multiaddr) -> StdResult<Self> {
         debug!("PassiveRelay: starting...");
         Ok(Self {
-            peer: self.peer.start().await?,
+            peer: Peer::new(addr).start().await?,
         })
     }
 

mithril-relay/tests/register_signer_signature.rs

@@ -48,17 +48,15 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
     let relay_peer_address = signer_relay.peer_address().unwrap();
     info!("Test: relay_address is '{relay_address:?}'");
 
-    let mut p2p_client1 = PassiveRelay::new(&addr)
-        .start()
+    let mut p2p_client1 = PassiveRelay::start(&addr)
         .await
         .expect("P2P client start failed");
     p2p_client1
         .peer
         .dial(relay_peer_address.clone())
         .expect("P2P client dial to the relay should not fail");
 
-    let mut p2p_client2 = PassiveRelay::new(&addr)
-        .start()
+    let mut p2p_client2 = PassiveRelay::start(&addr)
         .await
         .expect("P2P client start failed");
     p2p_client2