fix: update deps (#93)

Author: heilhead

Cargo.toml

@@ -22,11 +22,11 @@ relay_rpc = { path = "./relay_rpc", optional = true }
 [dev-dependencies]
 anyhow = "1"
 structopt = { version = "0.3", default-features = false }
-tokio = { version = "1.22", features = ["full"] }
+tokio = { version = "1.47", features = ["full"] }
 url = "2.3"
 warp = { version = "0.3", default-features = false }
 serde_json = "1.0"
-rand = "0.8.5"
+rand = "0.8"
 futures-util = "0.3"
 once_cell = "1.19"
 

examples/session.rs

@@ -39,7 +39,7 @@ impl ConnectionHandler for Handler {
         println!("[{}] connection open", self.name);
     }
 
-    fn disconnected(&mut self, frame: Option<CloseFrame<'static>>) {
+    fn disconnected(&mut self, frame: Option<CloseFrame>) {
         println!("[{}] connection closed: frame={frame:?}", self.name);
     }
 

examples/websocket_client.rs

@@ -38,7 +38,7 @@ impl ConnectionHandler for Handler {
         println!("[{}] connection open", self.name);
     }
 
-    fn disconnected(&mut self, frame: Option<CloseFrame<'static>>) {
+    fn disconnected(&mut self, frame: Option<CloseFrame>) {
         println!("[{}] connection closed: frame={frame:?}", self.name);
     }
 

relay_client/Cargo.toml

@@ -18,14 +18,14 @@ serde_qs = "0.10"
 pin-project = "1.0"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 url = "2.3"
-http = "1.0.0"
+http = "1.0"
 
 # HTTP client dependencies.
-reqwest = { version = "0.12.2", features = ["json"] }
+reqwest = { version = "0.12", features = ["json"] }
 
 # WebSocket client dependencies.
-tokio = { version = "1.22", features = ["rt", "time", "sync", "macros", "rt-multi-thread"] }
-tokio-tungstenite = "0.21.0"
+tokio = { version = "1.47", features = ["rt", "time", "sync", "macros", "rt-multi-thread"] }
+tokio-tungstenite = { version = "0.27", features = ["url"] }
 futures-channel = "0.3"
 tokio-stream = "0.1"
 tokio-util = "0.7"

relay_client/src/websocket.rs

@@ -63,7 +63,7 @@ pub enum WebsocketClientError {
 /// Wrapper around the websocket [`CloseFrame`] providing info about the
 /// connection closing reason.
 #[derive(Debug, Clone)]
-pub struct CloseReason(pub Option<CloseFrame<'static>>);
+pub struct CloseReason(pub Option<CloseFrame>);
 
 impl std::fmt::Display for CloseReason {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -117,7 +117,7 @@ pub trait ConnectionHandler: Send + 'static {
     fn connected(&mut self) {}
 
     /// Called when the Relay connection is closed.
-    fn disconnected(&mut self, _frame: Option<CloseFrame<'static>>) {}
+    fn disconnected(&mut self, _frame: Option<CloseFrame>) {}
 
     /// Called when a message is received from the Relay.
     fn message_received(&mut self, message: PublishedMessage);

relay_client/src/websocket/inbound.rs

@@ -57,6 +57,7 @@ where
 
         let message = Message::Text(
             serde_json::to_string(&Payload::Response(response))
+                .map(Into::into)
                 .map_err(ClientError::Serialization)?,
         );
 

relay_client/src/websocket/stream.rs

@@ -68,7 +68,7 @@ pub enum StreamEvent {
     /// The websocket connection was closed.
     ///
     /// This is the last event that can be produced by the stream.
-    ConnectionClosed(Option<CloseFrame<'static>>),
+    ConnectionClosed(Option<CloseFrame>),
 }
 
 /// Lower-level [`FusedStream`] interface for the client connection.
@@ -84,7 +84,7 @@ pub struct ClientStream {
     outbound_rx: UnboundedReceiver<Message>,
     requests: HashMap<MessageId, oneshot::Sender<Result<serde_json::Value, ClientError>>>,
     id_generator: MessageIdGenerator,
-    close_frame: Option<CloseFrame<'static>>,
+    close_frame: Option<CloseFrame>,
 }
 
 impl ClientStream {
@@ -119,7 +119,7 @@ impl ClientStream {
 
                 Entry::Vacant(entry) => {
                     entry.insert(tx);
-                    self.outbound_tx.send(Message::Text(data)).ok();
+                    self.outbound_tx.send(Message::Text(data.into())).ok();
                 }
             },
 
@@ -141,7 +141,7 @@ impl ClientStream {
     }
 
     /// Closes the connection.
-    pub async fn close(&mut self, frame: Option<CloseFrame<'static>>) -> Result<(), ClientError> {
+    pub async fn close(&mut self, frame: Option<CloseFrame>) -> Result<(), ClientError> {
         self.close_frame = frame.clone();
         self.socket
             .close(frame)

relay_rpc/Cargo.toml

@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive", "rc"] }
 serde-aux = { version = "4.1", default-features = false }
 serde_json = "1.0"
 thiserror = "1.0"
-ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
+ed25519-dalek = { version = "2.1", features = ["rand_core"] }
 rand = "0.8"
 chrono = { version = "0.4", default-features = false, features = [
     "std",
@@ -32,9 +32,9 @@ once_cell = "1.16"
 jsonwebtoken = "8.1"
 k256 = { version = "0.13", optional = true }
 sha3 = { version = "0.10", optional = true }
-sha2 = { version = "0.10.6" }
+sha2 = "0.10"
 url = "2"
-alloy = { version = "0.3.6", optional = true, features = [
+alloy = { version = "0.3", optional = true, features = [
     "json-rpc",
     "provider-http",
     "contract",
@@ -43,12 +43,12 @@ alloy = { version = "0.3.6", optional = true, features = [
 strum = { version = "0.26", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]
-tokio = { version = "1.35.1", features = ["test-util", "macros"] }
-alloy = { version = "0.3.6", features = ["node-bindings"] }
+tokio = { version = "1.47", features = ["test-util", "macros"] }
+alloy = { version = "0.3", features = ["node-bindings"] }
 
 [build-dependencies]
 serde_json = "1.0"
-hex = "0.4.3"
+hex = "0.4"
 
 [lints.clippy]
 indexing_slicing = "deny"