Skip to content

Commit fcf3d02

Browse files
d-e-s-od-e-s-o
committed
Update websocket-util dependency 0.14
This change updates the websocket-util dependency we rely on to version 0.14. The main change over 0.13 is that its tokio-tungstenite dependency, to which we are exposed, is updated from 0.23 to 0.26. To that end, we need to update our tokio-tungstenite dependency in lockstep.
1 parent 2169a66 commit fcf3d02

File tree

5 files changed

+71
-38
lines changed

5 files changed

+71
-38
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
--request POST \
5050
--url https://api.github.com/repos/${{ github.repository }}/releases \
5151
--header "Accept: application/vnd.github+json" \
52-
--header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"\
52+
--header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
5353
--header "X-GitHub-Api-Version: 2022-11-28" \
5454
--data "{
5555
\"tag_name\":\"v${version}\",

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Unreleased
22
----------
33
- Added `weighted_average` member to `data::v2::bars::Bar` type
44
- Bumped `hyper` dependency to `1.0`
5-
- Bumped `websocket-util` dependency to `0.13`
6-
- Bumped `tokio-tungstenite` dependency to `0.23`
5+
- Bumped `websocket-util` dependency to `0.14`
6+
- Bumped `tokio-tungstenite` dependency to `0.26`
77

88

99
0.29.0

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ thiserror = "1.0.30"
4646
tokio = {version = "1.13", default-features = false, features = ["net"]}
4747
tracing = {version = "0.1", default-features = false, features = ["attributes", "std"]}
4848
tracing-futures = {version = "0.2", default-features = false, features = ["std-future"]}
49-
tungstenite = {package = "tokio-tungstenite", version = "0.23", features = ["connect", "native-tls", "url"]}
49+
tungstenite = {package = "tokio-tungstenite", version = "0.26", features = ["connect", "native-tls", "url"]}
5050
url = "2.0"
5151
uuid = {version = "1.0", default-features = false, features = ["serde"]}
52-
websocket-util = "0.13"
52+
websocket-util = "0.14"
5353

5454
[dev-dependencies]
5555
serial_test = {version = "3.0.0", default-features = false}
5656
test-log = {version = "0.2.14", default-features = false, features = ["trace"]}
5757
tokio = {version = "1.13", default-features = false, features = ["rt-multi-thread", "macros"]}
5858
uuid = {version = "1.0", default-features = false, features = ["v4"]}
59-
websocket-util = {version = "0.13", features = ["test"]}
59+
websocket-util = {version = "0.14", features = ["test"]}
6060

6161
# A set of unused dependencies that we require to force correct minimum versions
6262
# of transitive dependencies, for cases where our dependencies have incorrect

‎src/api/v2/updates.rs‎

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,9 @@ mod tests {
438438

439439
use test_log::test;
440440

441+
use tungstenite::tungstenite::Bytes;
442+
use tungstenite::tungstenite::Utf8Bytes;
443+
441444
use websocket_util::test::WebSocketStream;
442445
use websocket_util::tungstenite::error::ProtocolError;
443446
use websocket_util::tungstenite::Message;
@@ -563,7 +566,7 @@ mod tests {
563566
async fn broken_stream() {
564567
async fn test(mut stream: WebSocketStream) -> Result<(), WebSocketError> {
565568
let msg = stream.next().await.unwrap()?;
566-
assert_eq!(msg, Message::Text(AUTH_REQ.to_string()));
569+
assert_eq!(msg, Message::Text(Utf8Bytes::from_static(AUTH_REQ)));
567570
Ok(())
568571
}
569572

@@ -585,14 +588,16 @@ mod tests {
585588
// Authentication.
586589
assert_eq!(
587590
stream.next().await.unwrap()?,
588-
Message::Text(AUTH_REQ.to_string()),
591+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
589592
);
590-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
593+
stream
594+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
595+
.await?;
591596

592597
// Subscription.
593598
assert_eq!(
594599
stream.next().await.unwrap()?,
595-
Message::Text(STREAM_REQ.to_string()),
600+
Message::Text(Utf8Bytes::from_static(STREAM_REQ)),
596601
);
597602
// Just respond with a Close.
598603
stream.send(Message::Close(None)).await?;
@@ -615,16 +620,20 @@ mod tests {
615620
// Authentication.
616621
assert_eq!(
617622
stream.next().await.unwrap()?,
618-
Message::Text(AUTH_REQ.to_string()),
623+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
619624
);
620-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
625+
stream
626+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
627+
.await?;
621628

622629
// Subscription.
623630
assert_eq!(
624631
stream.next().await.unwrap()?,
625-
Message::Text(STREAM_REQ.to_string()),
632+
Message::Text(Utf8Bytes::from_static(STREAM_REQ)),
626633
);
627-
stream.send(Message::Text(STREAM_RESP.to_string())).await?;
634+
stream
635+
.send(Message::Text(Utf8Bytes::from_static(STREAM_RESP)))
636+
.await?;
628637
Ok(())
629638
}
630639

@@ -643,12 +652,14 @@ mod tests {
643652
// Authentication.
644653
assert_eq!(
645654
stream.next().await.unwrap()?,
646-
Message::Text(AUTH_REQ.to_string()),
655+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
647656
);
648-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
657+
stream
658+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
659+
.await?;
649660

650661
stream
651-
.send(Message::Text("{ foobarbaz }".to_string()))
662+
.send(Message::Text(Utf8Bytes::from_static("{ foobarbaz }")))
652663
.await?;
653664
Ok(())
654665
}
@@ -670,23 +681,27 @@ mod tests {
670681
// Authentication.
671682
assert_eq!(
672683
stream.next().await.unwrap()?,
673-
Message::Text(AUTH_REQ.to_string()),
684+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
674685
);
675-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
686+
stream
687+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
688+
.await?;
676689

677690
// Subscription.
678691
assert_eq!(
679692
stream.next().await.unwrap()?,
680-
Message::Text(STREAM_REQ.to_string()),
693+
Message::Text(Utf8Bytes::from_static(STREAM_REQ)),
681694
);
682-
stream.send(Message::Text(STREAM_RESP.to_string())).await?;
695+
stream
696+
.send(Message::Text(Utf8Bytes::from_static(STREAM_RESP)))
697+
.await?;
683698

684699
// Wait until the connection was established before sending any
685700
// additional messages.
686701
let () = receiver.await.unwrap();
687702

688703
stream
689-
.send(Message::Text("{ foobarbaz }".to_string()))
704+
.send(Message::Text(Utf8Bytes::from_static("{ foobarbaz }")))
690705
.await?;
691706
stream.send(Message::Close(None)).await?;
692707
Ok(())
@@ -710,21 +725,25 @@ mod tests {
710725
// Authentication.
711726
assert_eq!(
712727
stream.next().await.unwrap()?,
713-
Message::Text(AUTH_REQ.to_string()),
728+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
714729
);
715-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
730+
stream
731+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
732+
.await?;
716733

717734
// Subscription.
718735
assert_eq!(
719736
stream.next().await.unwrap()?,
720-
Message::Text(STREAM_REQ.to_string()),
737+
Message::Text(Utf8Bytes::from_static(STREAM_REQ)),
721738
);
722-
stream.send(Message::Text(STREAM_RESP.to_string())).await?;
739+
stream
740+
.send(Message::Text(Utf8Bytes::from_static(STREAM_RESP)))
741+
.await?;
723742

724743
// Ping.
725-
stream.send(Message::Ping(Vec::new())).await?;
744+
stream.send(Message::Ping(Bytes::new())).await?;
726745
// Expect Pong.
727-
assert_eq!(stream.next().await.unwrap()?, Message::Pong(Vec::new()),);
746+
assert_eq!(stream.next().await.unwrap()?, Message::Pong(Bytes::new()),);
728747

729748
stream.send(Message::Close(None)).await?;
730749
Ok(())

‎src/data/v2/stream.rs‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,8 @@ mod tests {
920920

921921
use tokio::time::timeout;
922922

923+
use tungstenite::tungstenite::Utf8Bytes;
924+
923925
use websocket_util::test::WebSocketStream;
924926
use websocket_util::tungstenite::Message;
925927

@@ -1373,20 +1375,26 @@ mod tests {
13731375
#[test(tokio::test)]
13741376
async fn authenticate_and_subscribe() {
13751377
async fn test(mut stream: WebSocketStream) -> Result<(), WebSocketError> {
1376-
stream.send(Message::Text(CONN_RESP.to_string())).await?;
1378+
stream
1379+
.send(Message::Text(Utf8Bytes::from_static(CONN_RESP)))
1380+
.await?;
13771381
// Authentication.
13781382
assert_eq!(
13791383
stream.next().await.unwrap()?,
1380-
Message::Text(AUTH_REQ.to_string()),
1384+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
13811385
);
1382-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
1386+
stream
1387+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
1388+
.await?;
13831389

13841390
// Subscription.
13851391
assert_eq!(
13861392
stream.next().await.unwrap()?,
1387-
Message::Text(SUB_REQ.to_string()),
1393+
Message::Text(Utf8Bytes::from_static(SUB_REQ)),
13881394
);
1389-
stream.send(Message::Text(SUB_RESP.to_string())).await?;
1395+
stream
1396+
.send(Message::Text(Utf8Bytes::from_static(SUB_RESP)))
1397+
.await?;
13901398
stream.send(Message::Close(None)).await?;
13911399
Ok(())
13921400
}
@@ -1416,20 +1424,26 @@ mod tests {
14161424
#[test(tokio::test)]
14171425
async fn subscribe_error() {
14181426
async fn test(mut stream: WebSocketStream) -> Result<(), WebSocketError> {
1419-
stream.send(Message::Text(CONN_RESP.to_string())).await?;
1427+
stream
1428+
.send(Message::Text(Utf8Bytes::from_static(CONN_RESP)))
1429+
.await?;
14201430
// Authentication.
14211431
assert_eq!(
14221432
stream.next().await.unwrap()?,
1423-
Message::Text(AUTH_REQ.to_string()),
1433+
Message::Text(Utf8Bytes::from_static(AUTH_REQ)),
14241434
);
1425-
stream.send(Message::Text(AUTH_RESP.to_string())).await?;
1435+
stream
1436+
.send(Message::Text(Utf8Bytes::from_static(AUTH_RESP)))
1437+
.await?;
14261438

14271439
// Subscription.
14281440
assert_eq!(
14291441
stream.next().await.unwrap()?,
1430-
Message::Text(SUB_ERR_REQ.to_string()),
1442+
Message::Text(Utf8Bytes::from_static(SUB_ERR_REQ)),
14311443
);
1432-
stream.send(Message::Text(SUB_ERR_RESP.to_string())).await?;
1444+
stream
1445+
.send(Message::Text(Utf8Bytes::from_static(SUB_ERR_RESP)))
1446+
.await?;
14331447
stream.send(Message::Close(None)).await?;
14341448
Ok(())
14351449
}

0 commit comments

Comments
 (0)