feat: put wasm-bindgen-futures dep behind the wasm-bindgen feature …

…flag (alloy-rs#795) * feat: put wasm-bindgen-futures dep behind the `wasm-bindgen` feature flag * chore: move to [features], update CI --------- Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
ben186 · Jul 27, 2024 · 51a6d32 · 51a6d32
1 parent 562b539
commit 51a6d32
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,27 +21,21 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        rust: [
-          "stable",
-          "nightly",
-          "1.76" # MSRV
-        ]
-        flags: [
+        rust:
+          - "stable"
+          - "nightly"
+          - "1.76" # MSRV
+        flags:
           # No features
-          "--no-default-features",
+          - "--no-default-features"
           # Default features
-          "",
-        ]
-        include:
-          # All features
-          - os: "ubuntu-latest"
-            rust: "stable"
-            flags: "--all-features"
-          - os: "ubuntu-latest"
-            rust: "nightly"
+          - ""
+        exclude:
+          # All features on MSRV
+          - rust: "1.76" # MSRV
             flags: "--all-features"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
@@ -83,7 +77,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: wasm32-unknown-unknown
@@ -95,7 +89,6 @@ jobs:
         run: |
           cargo hack build --workspace --target wasm32-unknown-unknown \
             --exclude alloy-contract \
-            --exclude alloy-internal-test-utils \
             --exclude alloy-network \
             --exclude alloy-node-bindings \
             --exclude alloy-provider \
@@ -111,7 +104,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: wasm32-wasi
@@ -134,7 +127,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: riscv32imac-unknown-none-elf
@@ -149,7 +142,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-hack
       - uses: Swatinem/rust-cache@v2
@@ -178,7 +171,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
         with:
@@ -201,7 +194,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
@@ -211,7 +204,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
           toolchain: nightly

diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
@@ -12,7 +12,7 @@ jobs:
     name: cargo deny check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           command: check all
diff --git a/crates/alloy/Cargo.toml b/crates/alloy/Cargo.toml
@@ -86,6 +86,7 @@ hyper = [
     "alloy-provider?/hyper",
     "alloy-transport-http?/hyper",
 ]
+wasm-bindgen = ["alloy-transport?/wasm-bindgen"]
 
 # ---------------------------------------- Main re-exports --------------------------------------- #
 

diff --git a/crates/consensus/src/receipt/receipts.rs b/crates/consensus/src/receipt/receipts.rs
@@ -1,5 +1,5 @@
 use crate::receipt::{Eip658Value, TxReceipt};
-use alloy_primitives::{Bloom, Log, U128};
+use alloy_primitives::{Bloom, Log};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable};
 use core::borrow::Borrow;
 
@@ -43,7 +43,10 @@ where
         let key = if self.status.is_eip658() { "status" } else { "root" };
         s.serialize_field(key, &self.status)?;
 
-        s.serialize_field("cumulativeGasUsed", &U128::from(self.cumulative_gas_used))?;
+        s.serialize_field(
+            "cumulativeGasUsed",
+            &alloy_primitives::U128::from(self.cumulative_gas_used),
+        )?;
         s.serialize_field("logs", &self.logs)?;
 
         s.end()

diff --git a/crates/transport/Cargo.toml b/crates/transport/Cargo.toml
@@ -27,7 +27,10 @@ tower.workspace = true
 url.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen-futures = "0.4"
+wasm-bindgen-futures = { version = "0.4", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { workspace = true, features = ["rt"] }
+
+[features]
+wasm-bindgen = ["dep:wasm-bindgen-futures"]
diff --git a/crates/transport/src/utils.rs b/crates/transport/src/utils.rs
@@ -52,6 +52,10 @@ where
     T: Future<Output = ()> + 'static,
 {
     fn spawn_task(self) {
+        #[cfg(not(feature = "wasm-bindgen"))]
+        panic!("The 'wasm-bindgen' feature must be enabled");
+
+        #[cfg(feature = "wasm-bindgen")]
         wasm_bindgen_futures::spawn_local(self);
     }
 }