refactoring of relay-client

worldcoin · Dec 28, 2024 · 8b53a53 · 8b53a53
1 parent 2254f01
commit 8b53a53
Show file tree

Hide file tree

Showing 7 changed files with 418 additions and 408 deletions.
diff --git a/endpoints/Cargo.toml b/endpoints/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 edition = "2021"
 license = "MIT OR (Apache-2.0 WITH LLVM-exception)"
 repository = "https://github.com/worldcoin/orb-software"
-rust-version = "1.77.0"
+rust-version = "1.82.0"
 
 [dependencies]
 hex = "0.4.3"

diff --git a/endpoints/src/backend.rs b/endpoints/src/backend.rs
@@ -7,6 +7,7 @@ pub enum Backend {
     Prod,
     Staging,
     Analysis,
+    Local,
 }
 
 impl Backend {
@@ -66,6 +67,7 @@ impl FromStr for Backend {
             "prod" | "production" => Ok(Self::Prod),
             "stage" | "staging" | "dev" | "development" => Ok(Self::Staging),
             "analysis" | "analysis.ml" | "analysis-ml" => Ok(Self::Analysis),
+            "local" => Ok(Self::Local),
             _ => Err(BackendParseErr),
         }
     }

diff --git a/endpoints/src/endpoints.rs b/endpoints/src/endpoints.rs
@@ -10,6 +10,7 @@ pub struct Endpoints {
     pub ai_volume: Url,
     pub auth: Url,
     pub ping: Url,
+    pub relay: Url,
 }
 
 impl Endpoints {
@@ -20,7 +21,7 @@ impl Endpoints {
     pub fn new(backend: Backend, orb_id: &OrbId) -> Self {
         let subdomain = match backend {
             Backend::Prod => "orb",
-            Backend::Staging => "stage.orb",
+            Backend::Staging | Backend::Local => "stage.orb",
             Backend::Analysis => "analysis.ml",
         };
 
@@ -47,6 +48,8 @@ impl Endpoints {
                 orb_id,
                 "",
             ),
+            relay: Url::parse(&format!("https://relay.{subdomain}.worldcoin.org/"))
+                .expect("urls with validated orb ids should always parse"),
         }
     }
 }

diff --git a/relay-client/Cargo.toml b/relay-client/Cargo.toml
@@ -1,12 +1,19 @@
 [package]
 name = "orb-relay-client"
 version = "0.1.0"
-edition.workspace = true
 publish = false
 
+# orb-core can't consume crates that use workspace inheritance :(
+edition = "2021"
+license = "MIT OR (Apache-2.0 WITH LLVM-exception)"
+repository = "https://github.com/worldcoin/orb-software"
+rust-version = "1.82.0"
+
 [dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { version = "4", features = ["derive", "env"] }
+derive_more = { workspace = true, features = ["deref", "from", "into"] }
 eyre.workspace = true
+orb-endpoints.workspace = true
 orb-relay-messages.workspace = true
 orb-security-utils = { workspace = true, features = ["reqwest"] }
 rand = "0.8"