From 7ee32ec24d5251979c58d452701736de81618bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Sun, 8 Jun 2025 09:11:58 +0200 Subject: [PATCH 1/2] Fix cargo deny. --- .github/workflows/deny.yml | 2 -- .cargo/config => config.toml | 0 deny.toml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) rename .cargo/config => config.toml (100%) diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml index 2a780edde..4c4406b6a 100644 --- a/.github/workflows/deny.yml +++ b/.github/workflows/deny.yml @@ -2,8 +2,6 @@ name: Cargo deny on: pull_request: - schedule: - - cron: '0 0 * * *' push: branches: - master diff --git a/.cargo/config b/config.toml similarity index 100% rename from .cargo/config rename to config.toml diff --git a/deny.toml b/deny.toml index b74436368..571e3128b 100644 --- a/deny.toml +++ b/deny.toml @@ -60,7 +60,7 @@ unlicensed = "warn" # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.7 short identifier (+ optional exception)]. -allow = [] +allow = ["CDLA-Permissive-2.0"] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.7 short identifier (+ optional exception)]. From e421003697d3bc0180eb696f770f38d9d71bffe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Sun, 8 Jun 2025 11:10:24 +0200 Subject: [PATCH 2/2] Updates. --- .cargo/config | 1 + Cargo.toml | 8 ++++---- config.toml | 1 + src/helpers.rs | 2 +- src/transports/mod.rs | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 120000 .cargo/config diff --git a/.cargo/config b/.cargo/config new file mode 120000 index 000000000..e1fd6d8b1 --- /dev/null +++ b/.cargo/config @@ -0,0 +1 @@ +../config.toml \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index cce5bff28..4eaade461 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,19 +52,19 @@ soketto = { version = "0.8.0", optional = true } ## Shared (WS, HTTP) url = { version = "2.1", optional = true } ## EIP-1193 -js-sys = { version = "0.3.45", optional = true } +js-sys = { version = "0.3.77", optional = true } ### This is a transitive dependency, only here so we can turn on its wasm_bindgen feature getrandom = { version = "0.2", features = ["js"], optional = true } rand = { version = "0.8.1", optional = true } serde-wasm-bindgen = { version = "0.6.0", optional = true } -wasm-bindgen = { version = "0.2.68", optional = true } -wasm-bindgen-futures = { version = "0.4.18", optional = true } +wasm-bindgen = { version = "0.2.100", optional = true } +wasm-bindgen-futures = { version = "0.4.50", optional = true } [dev-dependencies] # For examples env_logger = "0.11" hex-literal = "0.4" -wasm-bindgen-test = "0.3.19" +wasm-bindgen-test = "0.3.50" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] hyper = { version = "1", default-features = false, features = ["server"] } diff --git a/config.toml b/config.toml index 4ec2f3b86..f4da5a3b4 100644 --- a/config.toml +++ b/config.toml @@ -1,2 +1,3 @@ [target.wasm32-unknown-unknown] runner = 'wasm-bindgen-test-runner' + diff --git a/src/helpers.rs b/src/helpers.rs index b71f2e2f8..b88a8710a 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -107,7 +107,7 @@ pub fn to_result_from_output(output: rpc::Output) -> error::Result { #[macro_use] #[cfg(test)] -pub mod tests { +mod tests { macro_rules! rpc_test { // With parameters ( diff --git a/src/transports/mod.rs b/src/transports/mod.rs index 17a2d5ff6..95a455e8c 100644 --- a/src/transports/mod.rs +++ b/src/transports/mod.rs @@ -6,9 +6,9 @@ pub use self::batch::Batch; pub mod either; pub use self::either::Either; -#[cfg(any(feature = "http", feature = "http-rustls"))] +#[cfg(any(feature = "http", feature = "http-rustls-tls"))] pub mod http; -#[cfg(any(feature = "http", feature = "http-rustls"))] +#[cfg(any(feature = "http", feature = "http-rustls-tls"))] pub use self::http::Http; #[cfg(any(feature = "ws-tokio", feature = "ws-async-std"))]