ping/rust: drop version for master builds

libp2p · Sep 22, 2022 · fae0ea9 · fae0ea9
1 parent 3bae10d
commit fae0ea9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -28,14 +28,13 @@ When a new version of libp2p is released, we want to make it permanent in the `p
 When a new version of libp2p is released, we want to make it permanent in the `ping/rust` test folder.
 
 1. In the `ping/_compositions/rust.toml` file,
-    - Copy the `[master]` section and turn it into a item in the `[[groups]]` array
-    - Update the `[master]` section with the new master version
+    - Copy the latest `[[groups]]` section and update it's `Id` and `CargoFeature` name.
 2. In the `ping/rust` folder,
-    - `Cargo.toml`: update the feature flags `libp2pvxxx` to fix the released version and add the new `master`
-    - `src/main.rs`: Update the `mod libp2p` definition with the new master
+    - `Cargo.toml`: create the feature flags `libp2pvxxx` with the released version,
+    - `src/main.rs`: Update the `mod libp2p` definition with the new version,
     - Run `cargo update` if needed. Try to build with `cargo build --features libp2pvxxx`
 3. Run the test on your machine
-    - Do once, from the test-plans root: import the test-plans with `testground plan import ./ --name libp2p`
+    - Do once, from the test-plans root: import the test-plans with `testground plan import --from ./ --name libp2p`
     - Run the test with `testground run composition -f ping/_compositions/rust-cross-versions.toml --wait`
 
 ## License

diff --git a/ping/_compositions/go-rust-interop-latest.toml b/ping/_compositions/go-rust-interop-latest.toml
@@ -93,7 +93,7 @@
         CARGO_FEATURES = '{{ .CargoFeatures }}'
         CARGO_REMOVE = '{{ .CargoFeatures }}'
         CARGO_PATCH = """
-          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true}
+          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], optional = true}
           """
   {{ end }}
   {{ end }}

diff --git a/ping/_compositions/go-rust-interop.toml b/ping/_compositions/go-rust-interop.toml
@@ -133,7 +133,7 @@
         CARGO_FEATURES = '{{ .CargoFeatures }}'
         CARGO_REMOVE = '{{ .CargoFeatures }}'
         CARGO_PATCH = """
-          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true}
+          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], optional = true}
           """
   {{ end }}
   {{ end }}

diff --git a/ping/_compositions/rust-cross-versions.toml b/ping/_compositions/rust-cross-versions.toml
@@ -37,7 +37,7 @@
         CARGO_FEATURES = '{{ .CargoFeatures }}'
         CARGO_REMOVE = '{{ .CargoFeatures }}'
         CARGO_PATCH = """
-          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], version = "{{ .Version }}", optional = true}
+          {{ .CargoFeatures }} = {package = "libp2p", git = "https://{{ or $.Env.GitTarget "github.com/libp2p/rust-libp2p" }}", rev = "{{ $.Env.GitReference }}", default_features = false, features = [ "websocket", "mplex", "yamux", "tcp-async-io", "ping", "noise", "dns-async-std" ], optional = true}
           """
     {{ end }}
   {{ end }}

diff --git a/ping/_compositions/rust.toml b/ping/_compositions/rust.toml
@@ -1,10 +1,8 @@
 [master]
-Version = '0.48.0'
-CargoFeatures = 'libp2pv0480'
+CargoFeatures = 'libp2pmaster'
 
 [custom]
-Version = '0.48.0'
-CargoFeatures = 'libp2pv0480'
+CargoFeatures = 'libp2pmaster'
 
 [[groups]]
 Id = "v0.47.0"

diff --git a/ping/rust/src/main.rs b/ping/rust/src/main.rs
@@ -11,8 +11,8 @@ use testground::network_conf::{
 };
 
 pub mod libp2p {
-    #[cfg(all(feature = "libp2pv0480",))]
-    pub use libp2pv0480::*;
+    #[cfg(all(feature = "libp2pmaster",))]
+    pub use libp2pmaster::*;
 
     #[cfg(all(feature = "libp2pv0470",))]
     pub use libp2pv0470::*;