post rebase attempt

libp2p · Nov 16, 2022 · f5881c8 · f5881c8
1 parent 4c706d2
commit f5881c8
Show file tree

Hide file tree

Showing 10 changed files with 562 additions and 151 deletions.
diff --git a/composer/demo/rust.toml b/composer/demo/rust.toml
@@ -20,17 +20,21 @@ Implementation = "rust"
 CargoFeatures = 'libp2pv0470'
 SupportedTransports = ["tcp"]
 
-[[groups]]
-Id = "rust-v0.46.0"
-Implementation = "rust"
-CargoFeatures = 'libp2pv0460'
-
-[[groups]]
-Id = "rust-v0.45.1"
-Implementation = "rust"
-CargoFeatures = 'libp2pv0450'
+# [[groups]]
+# Id = "rust-v0.46.0"
+# Version = '0.46.0'
+# Implementation = "rust"
+# CargoFeatures = 'libp2pv0460'
+# SupportedTransports = ["tcp"]
 
-[[groups]]
-Id = "rust-v0.44.0"
-Implementation = "rust"
-CargoFeatures = 'libp2pv0440'
+# [[groups]]
+# Id = "rust-v0.45.1"
+# Implementation = "rust"
+# CargoFeatures = 'libp2pv0450'
+# SupportedTransports = ["tcp"]
+#
+# [[groups]]
+# Id = "rust-v0.44.0"
+# Implementation = "rust"
+# CargoFeatures = 'libp2pv0440'
+# SupportedTransports = ["tcp"]
diff --git a/ping/_compositions/go-rust-interop-latest.toml b/ping/_compositions/go-rust-interop-latest.toml
@@ -73,7 +73,7 @@
 
     [groups.build_config]
       path = "./rust/"
-      
+
     [groups.build_config.build_args]
       CARGO_FEATURES = '{{ .CargoFeatures }}'
   {{ end }}
@@ -93,9 +93,9 @@
         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", "rsa" ], 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", "ping", "noise", "dns", "async-std", "rsa" ], optional = true}
           """
   {{ end }}
   {{ end }}
   {{ end }}
-{{ end }}
+{{ end }}
diff --git a/ping/_compositions/go-rust-interop.toml b/ping/_compositions/go-rust-interop.toml
@@ -133,9 +133,9 @@
         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", "rsa" ], 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", "ping", "noise", "dns", "async-std", "rsa" ], optional = true}
           """
   {{ end }}
   {{ end }}
   {{ end }}
-{{ 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", "rsa" ], 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", "ping", "noise", "dns", "async-std", "rsa" ], optional = true}
           """
     {{ end }}
   {{ end }}

diff --git a/ping/_compositions/rust.toml b/ping/_compositions/rust.toml
@@ -4,6 +4,10 @@ CargoFeatures = 'libp2pmaster'
 [custom]
 CargoFeatures = 'libp2pmaster'
 
+[[groups]]
+Id = '0.49.0'
+CargoFeatures = 'libp2pv0490'
+
 [[groups]]
 Id = '0.48.0'
 CargoFeatures = 'libp2pv0480'

diff --git a/ping/manifest.toml b/ping/manifest.toml
@@ -15,7 +15,7 @@ enabled = true
 
 [[testcases]]
 name = "ping"
-instances = { min = 2, max = 10000, default = 5 }
+instances = { min = 1, max = 10000, default = 5 }
 
   [testcases.params]
   secure_channel    = { type = "enum", desc = "secure channel used", values = ["noise"], default = "noise" }