chore(gossipsub): include in libp2p meta crate when compiling for wasm

Since #3973, gossipsub now fully supports wasm targets. It functions properly when added as a dependency on its own. However, when trying to use it under libp2p by activating a feature, it's not possible and the compiler will raise an error like `unresolved import libp2p::gossipsub`. This pull request enables the use of gossipsub for wasm targets when it's activated as a feature of the libp2p dependency. Pull-Request: #4217.
libp2p · Jul 20, 2023 · 660fadb · 660fadb
1 parent 1acf4a5
commit 660fadb
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,7 +75,7 @@ libp2p-identify = { version = "0.43.0", path = "protocols/identify" }
 libp2p-identity = { version = "0.2.1" }
 libp2p-kad = { version = "0.44.2", path = "protocols/kad" }
 libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" }
-libp2p-metrics = { version = "0.13.0", path = "misc/metrics" }
+libp2p-metrics = { version = "0.13.1", path = "misc/metrics" }
 libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" }
 libp2p-muxer-test-harness = { path = "muxers/test-harness" }
 libp2p-noise = { version = "0.43.0", path = "transports/noise" }

diff --git a/libp2p/CHANGELOG.md b/libp2p/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.52.2 - unreleased
+
+- Include gossipsub when compiling for wasm.
+  See [PR 4217].
+
+[PR 4217]: https://github.com/libp2p/rust-libp2p/pull/4217
+
 ## 0.52.1
 
 - Add `libp2p-webtransport-websys` providing WebTransport for WASM environments.

diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p"
 edition = "2021"
 rust-version = "1.65.0"
 description = "Peer-to-peer networking library"
-version = "0.52.1"
+version = "0.52.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

diff --git a/libp2p/src/lib.rs b/libp2p/src/lib.rs
@@ -65,7 +65,6 @@ pub use libp2p_dns as dns;
 #[doc(inline)]
 pub use libp2p_floodsub as floodsub;
 #[cfg(feature = "gossipsub")]
-#[cfg(not(target_os = "unknown"))]
 #[doc(inline)]
 pub use libp2p_gossipsub as gossipsub;
 #[cfg(feature = "identify")]

diff --git a/misc/metrics/CHANGELOG.md b/misc/metrics/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.13.1 - unreleased
+
+- Enable gossipsub related data-type fields when compiling for wasm.
+  See [PR 4217].
+
+[PR 4217]: https://github.com/libp2p/rust-libp2p/pull/4217
+
 ## 0.13.0 
 
 - Previously `libp2p-metrics::identify` would increase a counter / gauge / histogram on each

diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -3,40 +3,38 @@ name = "libp2p-metrics"
 edition = "2021"
 rust-version = "1.65.0"
 description = "Metrics for libp2p"
-version = "0.13.0"
+version = "0.13.1"
 authors = ["Max Inden <mail@max-inden.de>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [features]
+dcutr = ["libp2p-dcutr"]
 gossipsub = ["libp2p-gossipsub"]
 identify = ["libp2p-identify"]
 kad = ["libp2p-kad"]
 ping = ["libp2p-ping"]
 relay = ["libp2p-relay"]
-dcutr = ["libp2p-dcutr"]
 
 [dependencies]
 instant = "0.1.12"
 libp2p-core = { workspace = true }
 libp2p-dcutr =  { workspace = true, optional = true }
+libp2p-gossipsub =  { workspace = true, optional = true }
 libp2p-identify = { workspace = true, optional = true }
+libp2p-identity = { workspace = true }
 libp2p-kad = { workspace = true, optional = true }
 libp2p-ping = { workspace = true, optional = true }
 libp2p-relay =  { workspace = true, optional = true }
 libp2p-swarm = { workspace = true }
-libp2p-identity = { workspace = true }
-prometheus-client = { version = "0.21.2"}
 once_cell = "1.18.0"
-
-[target.'cfg(not(target_os = "unknown"))'.dependencies]
-libp2p-gossipsub =  { workspace = true, optional = true }
+prometheus-client = { version = "0.21.2"}
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
 # More information: https://docs.rs/about/builds#cross-compiling
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
 rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs"]
diff --git a/misc/metrics/src/identify.rs b/misc/metrics/src/identify.rs
@@ -64,7 +64,6 @@ const ALLOWED_PROTOCOLS: &[StreamProtocol] = &[
     #[cfg(feature = "dcutr")]
     libp2p_dcutr::PROTOCOL_NAME,
     // #[cfg(feature = "gossipsub")]
-    // #[cfg(not(target_os = "unknown"))]
     // TODO: Add Gossipsub protocol name
     libp2p_identify::PROTOCOL_NAME,
     libp2p_identify::PUSH_PROTOCOL_NAME,

diff --git a/misc/metrics/src/lib.rs b/misc/metrics/src/lib.rs
@@ -30,7 +30,6 @@
 #[cfg(feature = "dcutr")]
 mod dcutr;
 #[cfg(feature = "gossipsub")]
-#[cfg(not(target_os = "unknown"))]
 mod gossipsub;
 #[cfg(feature = "identify")]
 mod identify;
@@ -50,7 +49,6 @@ pub struct Metrics {
     #[cfg(feature = "dcutr")]
     dcutr: dcutr::Metrics,
     #[cfg(feature = "gossipsub")]
-    #[cfg(not(target_os = "unknown"))]
     gossipsub: gossipsub::Metrics,
     #[cfg(feature = "identify")]
     identify: identify::Metrics,
@@ -78,7 +76,6 @@ impl Metrics {
             #[cfg(feature = "dcutr")]
             dcutr: dcutr::Metrics::new(sub_registry),
             #[cfg(feature = "gossipsub")]
-            #[cfg(not(target_os = "unknown"))]
             gossipsub: gossipsub::Metrics::new(sub_registry),
             #[cfg(feature = "identify")]
             identify: identify::Metrics::new(sub_registry),
@@ -107,7 +104,6 @@ impl Recorder<libp2p_dcutr::Event> for Metrics {
 }
 
 #[cfg(feature = "gossipsub")]
-#[cfg(not(target_os = "unknown"))]
 impl Recorder<libp2p_gossipsub::Event> for Metrics {
     fn record(&self, event: &libp2p_gossipsub::Event) {
         self.gossipsub.record(event)