From c1b343f314b37fdc081e206a2302d82190390c41 Mon Sep 17 00:00:00 2001
From: Nasr <larko236@outlook.com>
Date: Wed, 7 Feb 2024 15:53:28 -0500
Subject: [PATCH] feat: update torii client

---
 crates/torii/client/src/client/mod.rs | 6 +++---
 crates/torii/libp2p/src/client/mod.rs | 2 +-
 crates/torii/libp2p/src/server/mod.rs | 5 ++++-
 crates/torii/libp2p/src/tests.rs      | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/crates/torii/client/src/client/mod.rs b/crates/torii/client/src/client/mod.rs
index bf4947ef5e..32984c6292 100644
--- a/crates/torii/client/src/client/mod.rs
+++ b/crates/torii/client/src/client/mod.rs
@@ -101,9 +101,9 @@ impl Client {
         })
     }
 
-    /// Waits for the relay connection to be established.
-    pub async fn wait_for_connection(&mut self) -> Result<(), Error> {
-        self.relay_client.command_sender.wait_for_connection().await.map_err(Error::RelayClient)
+    /// Waits for the relay to be ready and listening for messages.
+    pub async fn wait_for_relay(&mut self) -> Result<(), Error> {
+        self.relay_client.command_sender.wait_for_relay().await.map_err(Error::RelayClient)
     }
 
     /// Subscribes to a topic.
diff --git a/crates/torii/libp2p/src/client/mod.rs b/crates/torii/libp2p/src/client/mod.rs
index 8568299101..a947117210 100644
--- a/crates/torii/libp2p/src/client/mod.rs
+++ b/crates/torii/libp2p/src/client/mod.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures::channel::oneshot;
 use futures::lock::Mutex;
-use futures::{select, FutureExt, StreamExt};
+use futures::{select, StreamExt};
 use libp2p::gossipsub::{self, IdentTopic, MessageId, TopicHash};
 use libp2p::swarm::{NetworkBehaviour, Swarm, SwarmEvent};
 use libp2p::{identify, identity, ping, Multiaddr, PeerId};
diff --git a/crates/torii/libp2p/src/server/mod.rs b/crates/torii/libp2p/src/server/mod.rs
index d44d44f187..2d321d1242 100644
--- a/crates/torii/libp2p/src/server/mod.rs
+++ b/crates/torii/libp2p/src/server/mod.rs
@@ -190,7 +190,10 @@ impl Relay {
                                 "Subscribed to topic"
                             );
                         }
-                        ServerEvent::Gossipsub(gossipsub::Event::Unsubscribed { peer_id, topic }) => {
+                        ServerEvent::Gossipsub(gossipsub::Event::Unsubscribed {
+                            peer_id,
+                            topic,
+                        }) => {
                             info!(
                                 target: "torii::relay::server::gossipsub",
                                 peer_id = %peer_id,
diff --git a/crates/torii/libp2p/src/tests.rs b/crates/torii/libp2p/src/tests.rs
index 2b3348a6b1..225dc15a33 100644
--- a/crates/torii/libp2p/src/tests.rs
+++ b/crates/torii/libp2p/src/tests.rs
@@ -73,7 +73,7 @@ mod test {
         // Make sure the cert hash is correct - corresponding to the cert in the relay server
         let mut client = RelayClient::new(
             "/ip4/127.0.0.1/udp/9091/webrtc-direct/certhash/\
-            uEiCAoeHQh49fCHDolECesXO0CPR7fpz0sv0PWVaIahzT4g"
+             uEiCAoeHQh49fCHDolECesXO0CPR7fpz0sv0PWVaIahzT4g"
                 .to_string(),
         )?;