From 5761f99a9154fbc8792377b0b5a410851a6d883b Mon Sep 17 00:00:00 2001 From: Paul Quinn Date: Sat, 28 Dec 2024 10:29:31 -0800 Subject: [PATCH] removed references to orb_commands --- Cargo.lock | 1 + Cargo.toml | 4 ++-- relay-client/src/lib.rs | 23 +---------------------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 109ffcb5..40facb7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4909,6 +4909,7 @@ dependencies = [ [[package]] name = "orb-relay-messages" version = "0.0.0" +source = "git+https://github.com/worldcoin/orb-relay-messages.git?rev=6de97229c26d46eb600b1dd288b5325830ed816b#6de97229c26d46eb600b1dd288b5325830ed816b" dependencies = [ "prost 0.13.3", "prost-build 0.13.3", diff --git a/Cargo.toml b/Cargo.toml index c2a13717..5da20c06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -114,8 +114,8 @@ git = "https://github.com/worldcoin/orb-relay-messages.git" rev = "6de97229c26d46eb600b1dd288b5325830ed816b" features = ["client"] # Uncomment for local development -[patch."https://github.com/worldcoin/orb-relay-messages.git"] -orb-relay-messages = { path = "../orb-relay-messages/rust" } +# [patch."https://github.com/worldcoin/orb-relay-messages.git"] +# orb-relay-messages = { path = "../orb-relay-messages/rust" } [workspace.dependencies.nusb] git = "https://github.com/kevinmehall/nusb" diff --git a/relay-client/src/lib.rs b/relay-client/src/lib.rs index 9c2b2136..45af3150 100644 --- a/relay-client/src/lib.rs +++ b/relay-client/src/lib.rs @@ -1,7 +1,5 @@ //! Orb-Relay crate -use orb_relay_messages::{ - common, orb_commands, prost::Name, prost_types::Any, self_serve, -}; +use orb_relay_messages::{common, prost::Name, prost_types::Any, self_serve}; pub mod client; @@ -68,14 +66,6 @@ impl PayloadMatcher for self_serve::orb::v1::SignupEnded { } } -impl PayloadMatcher for orb_commands::v1::OrbCommand { - type Output = orb_commands::v1::OrbCommand; - - fn matches(payload: &Any) -> Option { - unpack_any::(payload) - } -} - pub trait IntoPayload { fn into_payload(self) -> Any; } @@ -163,15 +153,6 @@ impl IntoPayload for common::v1::NoState { } } -impl IntoPayload for orb_commands::v1::OrbCommand { - fn into_payload(self) -> Any { - Any::from_msg(&orb_commands::v1::OrbCommand { - commands: self.commands, - }) - .unwrap() - } -} - /// Debug any message pub fn debug_any(any: &Option) -> String { let Some(any) = any else { @@ -183,8 +164,6 @@ pub fn debug_any(any: &Option) -> String { format!("{:?}", w) } else if let Some(w) = unpack_any::(any) { format!("{:?}", w) - } else if let Some(w) = unpack_any::(any) { - format!("{:?}", w) } else { "Error".to_string() }