Skip to content

Commit

Permalink
fix(socketio/packet): generic ns path to avoid .into() everywhere (#340)
Browse files Browse the repository at this point in the history
  • Loading branch information
Totodore committed Jun 25, 2024
1 parent 4ab5215 commit 04f7ab3
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 84 deletions.
16 changes: 8 additions & 8 deletions socketioxide/src/ack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,12 +327,12 @@ mod test {
async fn broadcast_ack() {
let socket = create_socket();
let socket2 = create_socket();
let mut packet = Packet::event("/".into(), "test", "test".into());
let mut packet = Packet::event("/", "test", "test".into());
packet.inner.set_ack_id(1);
let socks = vec![socket.clone().into(), socket2.clone().into()];
let stream: AckStream<String> = AckInnerStream::broadcast(packet, socks, None).into();

let res_packet = Packet::ack("test".into(), "test".into(), 1);
let res_packet = Packet::ack("test", "test".into(), 1);
socket.recv(res_packet.inner.clone()).unwrap();
socket2.recv(res_packet.inner).unwrap();

Expand Down Expand Up @@ -383,12 +383,12 @@ mod test {
async fn broadcast_ack_with_deserialize_error() {
let socket = create_socket();
let socket2 = create_socket();
let mut packet = Packet::event("/".into(), "test", "test".into());
let mut packet = Packet::event("/", "test", "test".into());
packet.inner.set_ack_id(1);
let socks = vec![socket.clone().into(), socket2.clone().into()];
let stream: AckStream<String> = AckInnerStream::broadcast(packet, socks, None).into();

let res_packet = Packet::ack("test".into(), 132.into(), 1);
let res_packet = Packet::ack("test", 132.into(), 1);
socket.recv(res_packet.inner.clone()).unwrap();
socket2.recv(res_packet.inner).unwrap();

Expand Down Expand Up @@ -447,12 +447,12 @@ mod test {
async fn broadcast_ack_with_closed_socket() {
let socket = create_socket();
let socket2 = create_socket();
let mut packet = Packet::event("/".into(), "test", "test".into());
let mut packet = Packet::event("/", "test", "test".into());
packet.inner.set_ack_id(1);
let socks = vec![socket.clone().into(), socket2.clone().into()];
let stream: AckStream<String> = AckInnerStream::broadcast(packet, socks, None).into();

let res_packet = Packet::ack("test".into(), "test".into(), 1);
let res_packet = Packet::ack("test", "test".into(), 1);
socket.clone().recv(res_packet.inner.clone()).unwrap();

futures_util::pin_mut!(stream);
Expand Down Expand Up @@ -502,14 +502,14 @@ mod test {
async fn broadcast_ack_with_timeout() {
let socket = create_socket();
let socket2 = create_socket();
let mut packet = Packet::event("/".into(), "test", "test".into());
let mut packet = Packet::event("/", "test", "test".into());
packet.inner.set_ack_id(1);
let socks = vec![socket.clone().into(), socket2.clone().into()];
let stream: AckStream<String> =
AckInnerStream::broadcast(packet, socks, Some(Duration::from_millis(10))).into();

socket
.recv(Packet::ack("test".into(), "test".into(), 1).inner)
.recv(Packet::ack("test", "test".into(), 1).inner)
.unwrap();

futures_util::pin_mut!(stream);
Expand Down
Loading

0 comments on commit 04f7ab3

Please sign in to comment.