Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #288 #291

Merged
merged 1 commit into from
Dec 21, 2024
+796 −1,042
Merged

Fix #288 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
**/profile.json
**/rustc-ice-*.txt
**/target
boringssl
mdbook-target
wtx-docs/book
wtx-fuzz/artifacts
Expand Down
109 changes: 54 additions & 55 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions wtx-fuzz/web_socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
use tokio::runtime::Builder;
use wtx::{
misc::{simple_seed, BytesStream, Xorshift64},
web_socket::{Frame, OpCode, WebSocketBuffer, WebSocketServerOwned},
web_socket::{Frame, OpCode, WebSocket, WebSocketBuffer},
};

libfuzzer_sys::fuzz_target!(|data: (OpCode, Vec<u8>)| {
Builder::new_current_thread().enable_all().build().unwrap().block_on(async move {
let Ok(mut ws) = WebSocketServerOwned::new(
let Ok(mut ws) = WebSocket::<_, _, _, false>::new(
(),
false,
Xorshift64::from(simple_seed()),
Expand Down
8 changes: 4 additions & 4 deletions wtx-instances/generic-examples/client-api-framework.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ use tokio::net::TcpStream;
use wtx::{
client_api_framework::{
misc::{Pair, RequestLimit, RequestThrottling},
network::{transport::Transport, HttpParams, WsParams},
network::{transport::SendingRecievingTransport, HttpParams, WsParams},
Api,
},
data_transformation::dnsn::SerdeJson,
http::client_framework::ClientFrameworkTokio,
misc::{simple_seed, Uri, Xorshift64},
web_socket::{WebSocketBuffer, WebSocketClient},
web_socket::{WebSocket, WebSocketBuffer},
};

wtx::create_packages_aux_wrapper!();
Expand Down Expand Up @@ -97,11 +97,11 @@ async fn http_pair(
async fn web_socket_pair() -> wtx::Result<
Pair<
PkgsAux<GenericThrottlingApi, SerdeJson, WsParams>,
WebSocketClient<(), TcpStream, WebSocketBuffer>,
WebSocket<(), TcpStream, WebSocketBuffer, true>,
>,
> {
let uri = Uri::new("ws://generic_web_socket_uri.com");
let web_socket = WebSocketClient::connect(
let web_socket = WebSocket::connect(
(),
[],
false,
Expand Down
Loading
Loading