From 97b8b2e91192031072ffeaf7e2345d206588a6e3 Mon Sep 17 00:00:00 2001
From: aidan46 <aidansullivan.dev@gmail.com>
Date: Thu, 30 Jan 2025 10:24:55 +0800
Subject: [PATCH] fix: Move peer-resolver into client examples

---
 Cargo.lock                                    | 13 +------------
 Cargo.toml                                    |  1 -
 examples/peer-resolver/Cargo.toml             | 19 -------------------
 storage-provider/client/Cargo.toml            |  3 +++
 .../client/examples/peer-resolver.rs          | 12 +++++++++++-
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 examples/peer-resolver/Cargo.toml
 rename examples/peer-resolver/src/main.rs => storage-provider/client/examples/peer-resolver.rs (86%)

diff --git a/Cargo.lock b/Cargo.lock
index 20609418c..e6dd289e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13587,18 +13587,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
-[[package]]
-name = "peer-resolver"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "libp2p 0.54.1",
- "tokio",
- "tracing",
- "tracing-subscriber 0.3.19",
-]
-
 [[package]]
 name = "pem"
 version = "1.1.1"
@@ -13877,6 +13865,7 @@ dependencies = [
 name = "polka-storage-provider-client"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "async-trait",
  "bls12_381",
  "cid 0.11.1",
diff --git a/Cargo.toml b/Cargo.toml
index e498c416b..d3b18cc73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ repository = "https://github.com/eigerco/polka-storage"
 
 [workspace]
 members = [
-  "examples/peer-resolver",
   "lib/polka-storage-proofs",
   "maat",
   "mater/cli",
diff --git a/examples/peer-resolver/Cargo.toml b/examples/peer-resolver/Cargo.toml
deleted file mode 100644
index bc80db146..000000000
--- a/examples/peer-resolver/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-authors.workspace = true
-edition.workspace = true
-homepage.workspace = true
-license-file.workspace = true
-name = "peer-resolver"
-repository.workspace = true
-version = "0.1.0"
-
-[dependencies]
-anyhow.workspace = true
-clap = { workspace = true, features = ["derive"] }
-libp2p = { workspace = true, features = ["identify", "macros", "noise", "rendezvous", "tcp", "tokio", "yamux"] }
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-tracing.workspace = true
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
-[lints]
-workspace = true
diff --git a/storage-provider/client/Cargo.toml b/storage-provider/client/Cargo.toml
index c3b8a9ec3..91fc1032d 100644
--- a/storage-provider/client/Cargo.toml
+++ b/storage-provider/client/Cargo.toml
@@ -34,6 +34,9 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 url = { workspace = true }
 
+[dev-dependencies]
+anyhow.workspace = true
+libp2p = { workspace = true, features = ["identify", "macros", "noise", "rendezvous", "tcp", "tokio", "yamux"] }
 
 [lints]
 workspace = true
diff --git a/examples/peer-resolver/src/main.rs b/storage-provider/client/examples/peer-resolver.rs
similarity index 86%
rename from examples/peer-resolver/src/main.rs
rename to storage-provider/client/examples/peer-resolver.rs
index ed2af18e2..27c70d46f 100644
--- a/examples/peer-resolver/src/main.rs
+++ b/storage-provider/client/examples/peer-resolver.rs
@@ -1,3 +1,14 @@
+//! Peer Resolver example
+//!
+//! This example shows how to use the rendezvous client protocol to
+//! connect to rendezvous bootstrap, and send a discovery message,
+//! requesting the bootstrap node to return their registrations.
+//! Then it will check the registrations to see if a given Peer ID
+//! is contained in them to get a Peer ID to multiaddr mapping.
+//! If the bootstrap node does not have information on the given Peer
+//! ID, the example will return an error.
+//! NOTE: This example is to be removed and implemented into the
+//! client at some point.
 use std::time::Duration;
 
 use anyhow::{bail, Result};
@@ -59,7 +70,6 @@ async fn discover(
             SwarmEvent::ConnectionEstablished { peer_id, .. } => {
                 if peer_id == rendezvous_point {
                     tracing::info!("Connection established with rendezvous point {}", peer_id);
-                    tracing::info!("Connected to rendezvous point, discovering nodes...");
 
                     // Requesting rendezvous point for peer discovery
                     swarm