rename branch and fix clippy

Cargo.toml

@@ -7,11 +7,11 @@ authors = ["WalletConnect Team"]
 license = "Apache-2.0"
 
 [workspace]
-members = ["blockchain_api", "sign_api", "relay_client", "relay_rpc"]
+members = ["blockchain_api", "relay_client", "relay_rpc", "sign_api"]
 
 [features]
 default = ["full"]
-full = ["client", "rpc", "http"]
+full = ["client", "rpc", "http", "sign_api"]
 client = ["dep:relay_client"]
 http = ["relay_client/http"]
 rpc = ["dep:relay_rpc"]

relay_rpc/src/rpc.rs

@@ -4,7 +4,14 @@
 use {
     crate::domain::{DidKey, MessageId, SubscriptionId, Topic},
     params::session::{
-        delete::SessionDeleteRequest, event::SessionEventRequest, extend::SessionExtendRequest, ping::SessionPingRequest, propose::SessionProposeRequest, request::SessionRequestRequest, settle::SessionSettleRequest, update::SessionUpdateRequest, RequestParams
+        delete::SessionDeleteRequest,
+        event::SessionEventRequest,
+        extend::SessionExtendRequest,
+        propose::SessionProposeRequest,
+        request::SessionRequestRequest,
+        settle::SessionSettleRequest,
+        update::SessionUpdateRequest,
+        RequestParams,
     },
     serde::{de::DeserializeOwned, Deserialize, Serialize},
     std::{fmt::Debug, sync::Arc},

relay_rpc/src/rpc/params/session.rs

@@ -1,18 +1,29 @@
+pub mod delete;
+pub mod event;
+pub mod extend;
+pub mod ping;
 pub mod propose;
-pub mod settle;
 pub mod request;
-pub mod ping;
-pub mod delete;
+pub mod settle;
 pub mod update;
-pub mod extend;
-pub mod event;
 
 use {
-    delete::SessionDeleteRequest, event::SessionEventRequest, extend::SessionExtendRequest, paste::paste, propose::{SessionProposeRequest, SessionProposeResponse}, regex::Regex, request::SessionRequestRequest, serde::{Deserialize, Serialize}, serde_json::Value, settle::SessionSettleRequest, std::{
+    delete::SessionDeleteRequest,
+    event::SessionEventRequest,
+    extend::SessionExtendRequest,
+    paste::paste,
+    propose::{SessionProposeRequest, SessionProposeResponse},
+    regex::Regex,
+    request::SessionRequestRequest,
+    serde::{Deserialize, Serialize},
+    serde_json::Value,
+    settle::SessionSettleRequest,
+    std::{
         collections::{BTreeMap, BTreeSet},
         ops::Deref,
         sync::OnceLock,
-    }, update::SessionUpdateRequest
+    },
+    update::SessionUpdateRequest,
 };
 
 /// https://specs.walletconnect.com/2.0/specs/clients/sign/namespaces

relay_rpc/src/rpc/params/session/delete.rs

@@ -1,8 +1,10 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessiondelete
 
-use super::IrnMetadata;
-use serde::{Deserialize, Serialize};
+use {
+    super::IrnMetadata,
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1112,
@@ -25,10 +27,10 @@ pub struct SessionDeleteRequest {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_session_delete_request() -> Result<()> {

relay_rpc/src/rpc/params/session/event.rs

@@ -1,9 +1,10 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessionevent
 
-use serde::{Deserialize, Serialize};
-
-use super::IrnMetadata;
+use {
+    super::IrnMetadata,
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1110,
@@ -36,10 +37,10 @@ pub struct SessionEventRequest {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_accounts_changed_event() -> Result<()> {

relay_rpc/src/rpc/params/session/extend.rs

@@ -1,9 +1,10 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessionextend
 
-use serde::{Deserialize, Serialize};
-
-use super::IrnMetadata;
+use {
+    super::IrnMetadata,
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1106,
@@ -25,10 +26,10 @@ pub struct SessionExtendRequest {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_session_extend_request() -> Result<()> {

relay_rpc/src/rpc/params/session/ping.rs

@@ -1,8 +1,9 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessionping
-//!
-use super::IrnMetadata;
-use serde::{Deserialize, Serialize};
+use {
+    super::IrnMetadata,
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1114,
@@ -22,10 +23,10 @@ pub struct SessionPingRequest {}
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_session_ping_request() -> Result<()> {

relay_rpc/src/rpc/params/session/request.rs

@@ -1,8 +1,10 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessionrequest
 
-use super::IrnMetadata;
-use serde::{Deserialize, Serialize};
+use {
+    super::IrnMetadata,
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1108,
@@ -19,13 +21,13 @@ pub(super) const IRN_RESPONSE_METADATA: IrnMetadata = IrnMetadata {
 #[derive(Debug, Serialize, PartialEq, Eq, Hash, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Request {
-   pub method: String,
+    pub method: String,
     /// Opaque blockchain RPC parameters.
     ///
     /// Parsing is deferred to a higher level, blockchain RPC aware code.
-   pub params: serde_json::Value,
+    pub params: serde_json::Value,
     #[serde(skip_serializing_if = "Option::is_none")]
-  pub  expiry: Option<u64>,
+    pub expiry: Option<u64>,
 }
 
 #[derive(Debug, Serialize, PartialEq, Eq, Hash, Deserialize, Clone)]
@@ -37,10 +39,10 @@ pub struct SessionRequestRequest {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_eth_sign_transaction() -> Result<()> {

relay_rpc/src/rpc/params/session/update.rs

@@ -1,8 +1,10 @@
 //! https://specs.walletconnect.com/2.0/specs/clients/sign/rpc-methods
 //! #wc_sessionupdate
 
-use super::{IrnMetadata, SettleNamespaces};
-use serde::{Deserialize, Serialize};
+use {
+    super::{IrnMetadata, SettleNamespaces},
+    serde::{Deserialize, Serialize},
+};
 
 pub(super) const IRN_REQUEST_METADATA: IrnMetadata = IrnMetadata {
     tag: 1104,
@@ -24,10 +26,10 @@ pub struct SessionUpdateRequest {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use super::super::tests::param_serde_test;
-    use anyhow::Result;
+    use {
+        super::{super::tests::param_serde_test, *},
+        anyhow::Result,
+    };
 
     #[test]
     fn test_serde_session_update_request() -> Result<()> {

sign_api/examples/session.rs

@@ -14,7 +14,17 @@ use {
         rpc::{
             params::{
                 session::{
-                    delete::SessionDeleteRequest, propose::{SessionProposeRequest, SessionProposeResponse}, settle::{Controller, SessionSettleRequest}, IrnMetadata, ProposeNamespace, ProposeNamespaces, RelayProtocolMetadata, RequestParams, ResponseParamsSuccess, SettleNamespace, SettleNamespaces
+                    delete::SessionDeleteRequest,
+                    propose::{SessionProposeRequest, SessionProposeResponse},
+                    settle::{Controller, SessionSettleRequest},
+                    IrnMetadata,
+                    ProposeNamespace,
+                    ProposeNamespaces,
+                    RelayProtocolMetadata,
+                    RequestParams,
+                    ResponseParamsSuccess,
+                    SettleNamespace,
+                    SettleNamespaces,
                 },
                 Metadata,
                 Relay,
@@ -213,8 +223,8 @@ async fn process_proposal_request(
     Ok(create_proposal_response(responder_public_key))
 }
 
-fn process_session_delete_request(delete_params: SessionDeleteRequest) ->
-ResponseParamsSuccess {     println!(
+fn process_session_delete_request(delete_params: SessionDeleteRequest) -> ResponseParamsSuccess {
+    println!(
         "\nSession is being terminated reason={}, code={}",
         delete_params.message, delete_params.code,
     );
@@ -439,39 +449,33 @@ impl Context {
     }
 
     /// Deletes session identified by the `topic`.
-       ///
-       /// When session count reaches zero, unsubscribes from topic and sends
-       /// termination signal to end the application execution.
-       ///
-       /// TODO: should really delete pairing as well:
-       /// https://specs.walletconnect.com/2.0/specs/clients/core/pairing/
-       /// rpc-methods#wc_pairingdelete
-       async fn session_delete_cleanup(&mut self, topic: Topic) -> Result<()> {
-           let _session = self
-               .sessions
-               .remove(&topic)
-               .ok_or_else(|| anyhow::anyhow!("Attempt to remove non-existing session"))?;
-
-           self.client
-               .unsubscribe(topic)
-               .await?;
-
-           // Un-pair when there are no more session subscriptions.
-           // TODO: Delete pairing, not just unsubscribe.
-           if self.sessions.is_empty() {
-               println!("\nNo active sessions left, terminating the pairing");
-
-               self.client
-                   .unsubscribe(
-                       self.pairing.topic.clone(),
-                   )
-                   .await?;
-
-               self.pairing.terminator.send(()).await?;
-           }
-
-           Ok(())
-       }
+    ///
+    /// When session count reaches zero, unsubscribes from topic and sends
+    /// termination signal to end the application execution.
+    ///
+    /// TODO: should really delete pairing as well:
+    /// https://specs.walletconnect.com/2.0/specs/clients/core/pairing/
+    /// rpc-methods#wc_pairingdelete
+    async fn session_delete_cleanup(&mut self, topic: Topic) -> Result<()> {
+        let _session = self
+            .sessions
+            .remove(&topic)
+            .ok_or_else(|| anyhow::anyhow!("Attempt to remove non-existing session"))?;
+
+        self.client.unsubscribe(topic).await?;
+
+        // Un-pair when there are no more session subscriptions.
+        // TODO: Delete pairing, not just unsubscribe.
+        if self.sessions.is_empty() {
+            println!("\nNo active sessions left, terminating the pairing");
+
+            self.client.unsubscribe(self.pairing.topic.clone()).await?;
+
+            self.pairing.terminator.send(()).await?;
+        }
+
+        Ok(())
+    }
 }
 
 #[tokio::main]

sign_api/src/pairing_uri.rs

@@ -15,7 +15,11 @@
 // pairing is considered expired, should be generated 5 minutes in the future
 
 use {
-    lazy_static::lazy_static, regex::Regex, relay_rpc::domain::Topic, std::{collections::HashMap, str::FromStr}, thiserror::Error, url::Url
+    lazy_static::lazy_static,
+    regex::Regex,
+    std::{collections::HashMap, str::FromStr},
+    thiserror::Error,
+    url::Url,
 };
 
 lazy_static! {

src/lib.rs

@@ -2,3 +2,5 @@
 pub use relay_client as client;
 #[cfg(feature = "rpc")]
 pub use relay_rpc as rpc;
+#[cfg(feature = "sign_api")]
+pub use sign_api;