PR requested updates

.gitignore

@@ -14,6 +14,7 @@
 
 # IDE stuff
 .idea/
+.vscode/
 
 # Allow developers to use python pre-commit locally
 /.pre-commit-config.yaml

relay-client/Cargo.toml

@@ -7,7 +7,6 @@ publish = false
 [dependencies]
 clap = { version = "4", features = ["derive"] }
 eyre.workspace = true
-json5 = "0.4"
 orb-relay-messages.workspace = true
 orb-security-utils = { workspace = true, features = ["reqwest"] }
 rand = "0.8"

relay-client/src/bin/decode-msg.rs

@@ -18,7 +18,7 @@ fn main() -> Result<()> {
 
 fn decode_payload(json: &str) -> Result<String> {
     println!("json: {}", json);
-    let v: Value = json5::from_str(json)?;
+    let v: Value = serde_json::from_str(json)?;
     let any = Any {
         type_url: v["type_url"]
             .as_str()

relay-client/src/bin/manual-test.rs

@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use clap::Parser;
 use eyre::{Ok, Result};
 use orb_relay_client::{client::Client, debug_any, PayloadMatcher};
@@ -120,7 +118,7 @@ async fn app_to_orb() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in orb_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -160,7 +158,7 @@ async fn app_to_orb() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in orb_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -234,7 +232,7 @@ async fn orb_to_app() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -274,7 +272,7 @@ async fn orb_to_app() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -342,7 +340,7 @@ async fn orb_to_app_with_state_request() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -376,7 +374,7 @@ async fn orb_to_app_with_state_request() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -404,7 +402,7 @@ async fn orb_to_app_with_state_request() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -476,7 +474,7 @@ async fn orb_to_app_blocking_send() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -519,7 +517,7 @@ async fn orb_to_app_blocking_send() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -595,7 +593,7 @@ async fn orb_to_app_with_clients_created_later_and_delay() -> Result<()> {
 
     let now = Instant::now();
     'ext: loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -657,7 +655,7 @@ async fn stage_consumer_app() -> Result<()> {
     tracing::info!("Time took to connect: {}ms", now.elapsed().as_millis());
 
     loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",
@@ -715,7 +713,7 @@ async fn stage_producer_from_app_start_orb_signup() -> Result<()> {
     tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
 
     loop {
-        #[allow(clippy::never_loop)]
+        #[expect(clippy::never_loop)]
         for msg in app_client.get_buffered_messages().await {
             tracing::info!(
                 "Received message: from: {:?}, to: {:?}, seq: {:?}, payload: {:?}",

relay-client/src/client.rs

@@ -665,6 +665,7 @@ impl<'a> PollerAgent<'a> {
         Ok((response_stream, sender_tx))
     }
 
+    // TODO: See if we can move this setup into `orb-security-utils`.
     fn create_tls_config() -> ClientTlsConfig {
         ClientTlsConfig::new().ca_certificates(vec![
             Certificate::from_pem(AWS_ROOT_CA1_CERT),

relay-client/src/lib.rs

@@ -3,7 +3,6 @@ use orb_relay_messages::{common, prost::Name, prost_types::Any, self_serve};
 
 pub mod client;
 
-#[allow(missing_docs)]
 pub trait PayloadMatcher {
     type Output;
     fn matches(payload: &Any) -> Option<Self::Output>;
@@ -67,7 +66,6 @@ impl PayloadMatcher for self_serve::orb::v1::SignupEnded {
     }
 }
 
-#[allow(missing_docs)]
 pub trait IntoPayload {
     fn into_payload(self) -> Any;
 }