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.

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

Add regex feature for gossipsub #2056

Merged
merged 5 commits into from
Apr 27, 2021
Merged

Conversation

tzemanovic
Copy link
Contributor

closes #2055

@mxinden mxinden requested a review from AgeManning April 22, 2021 14:50
@AgeManning
Copy link
Contributor

It might make more sense to just remove the condition compilation inside gossipsub such that any libp2p implementation that compiles with gossipsub also gets regex by default.

This saves the crate-level feature flag that also enables gossipsub and regex.

What do you think?

@mxinden
Copy link
Member

mxinden commented Apr 26, 2021

What do you think?

Though this question is likely not addressed to me, I am in favor of @AgeManning's suggestion. @tzemanovic do you want to update the pull request?

@tzemanovic
Copy link
Contributor Author

sounds good, will do!

@mxinden
Copy link
Member

mxinden commented Apr 27, 2021

@tzemanovic can you apply the diff below? I can then cut a patch release of libp2p-gossipsub later today.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62705acc..629bc522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 
 - Update individual crates.
     - `libp2p-core`
+    - `libp2p-gossipsub`
 
 ## Version 0.37.1 [2021-04-14]
 
diff --git a/Cargo.toml b/Cargo.toml
index acb1ab8d..1b1a5ceb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ futures = "0.3.1"
 lazy_static = "1.2"
 libp2p-core = { version = "0.28.3", path = "core",  default-features = false }
 libp2p-floodsub = { version = "0.29.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.30.0", path = "./protocols/gossipsub", optional = true }
+libp2p-gossipsub = { version = "0.30.1", path = "./protocols/gossipsub", optional = true }
 libp2p-identify = { version = "0.29.0", path = "protocols/identify", optional = true }
 libp2p-kad = { version = "0.30.0", path = "protocols/kad", optional = true }
 libp2p-mplex = { version = "0.28.0", path = "muxers/mplex", optional = true }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 9d916961..7bc1f9aa 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.30.1 [2021-04-27]
+
+- Remove `regex-filter` feature flag thus always enabling `regex::RegexSubscriptionFilter` [PR
+  2056](https://github.com/libp2p/rust-libp2p/pull/2056).
+
 # 0.30.0 [2021-04-13]
 
 - Update `libp2p-swarm`.
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index eaa21894..a0ecc7e3 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-gossipsub"
 edition = "2018"
 description = "Gossipsub protocol for libp2p"
-version = "0.30.0"
+version = "0.30.1"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

@tzemanovic
Copy link
Contributor Author

@mxinden done, thanks!

@mxinden mxinden merged commit 6257a8d into libp2p:master Apr 27, 2021
@mxinden
Copy link
Member

mxinden commented Apr 27, 2021

Thanks @tzemanovic.

libp2p-gossipsub v0.30.1 tagged and published.

AgeManning pushed a commit to sigp/rust-libp2p that referenced this pull request May 4, 2021
Remove `regex-filter` feature flag thus always enabling
`regex::RegexSubscriptionFilter`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RegexSubscriptionFilter hidden behind undefined feature
3 participants