From 5210452aef8ee321c1dffe212c6f5a6910f8d51f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 17:23:18 -0700
Subject: [PATCH] chore: add go-libp2p@v0.34.0 to transport-interop (#363)

* chore: add go-libp2p@v0.34.0 to transport-interop

* Add webtransport back in

* chore: add go-libp2p@v0.35.0 to transport-interop

* Remove go-libp2p versions < 0.33

---------

Co-authored-by: galargh <galargh@users.noreply.github.com>
Co-authored-by: Marco Munizaga <marco@marcopolo.io>
Co-authored-by: Marco Munizaga <git@marcopolo.io>
---
 transport-interop/impl/go/v0.34/Makefile     | 31 +++++++
 transport-interop/impl/go/v0.34/version.lock |  1 +
 transport-interop/impl/go/v0.35/Makefile     | 31 +++++++
 transport-interop/impl/go/v0.35/version.lock |  1 +
 transport-interop/versionsInput.json         | 97 +++++++-------------
 5 files changed, 98 insertions(+), 63 deletions(-)
 create mode 100644 transport-interop/impl/go/v0.34/Makefile
 create mode 100644 transport-interop/impl/go/v0.34/version.lock
 create mode 100644 transport-interop/impl/go/v0.35/Makefile
 create mode 100644 transport-interop/impl/go/v0.35/version.lock

diff --git a/transport-interop/impl/go/v0.34/Makefile b/transport-interop/impl/go/v0.34/Makefile
new file mode 100644
index 0000000..26e7e80
--- /dev/null
+++ b/transport-interop/impl/go/v0.34/Makefile
@@ -0,0 +1,31 @@
+image_name := go-v0.34
+version := 0.34.0
+
+all: image.json
+
+image.json: verify-checksum go-libp2p-${version}
+	cd go-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+go-libp2p-${version}: go-libp2p-${version}.zip
+	unzip -o go-libp2p-${version}.zip
+
+go-libp2p-${version}.zip:
+	wget -O $@ "https://github.com/libp2p/go-libp2p/archive/v${version}.zip"
+
+# Run `make version.lock` to generate this lock file. This file should be commited.
+# This locks the exact contents of the specified version. This lets us use the
+# human readable name while still making sure the contents don't change.
+version.lock: go-libp2p-${version}.zip
+	shasum -a 256 go-libp2p-${version}.zip > $@
+
+verify-checksum: go-libp2p-${version}.zip
+	shasum -a 256 -c version.lock
+
+.PHONY: clean all verify-checksum
+
+clean:
+	rm image.json
+	rm go-libp2p-*.zip
+	rm -rf go-libp2p-*
diff --git a/transport-interop/impl/go/v0.34/version.lock b/transport-interop/impl/go/v0.34/version.lock
new file mode 100644
index 0000000..b4c13ed
--- /dev/null
+++ b/transport-interop/impl/go/v0.34/version.lock
@@ -0,0 +1 @@
+4d9d7fbf769a4008112475419174e18a83a6eeebf0fa0635a50e4afd692b5510  go-libp2p-0.34.0.zip
diff --git a/transport-interop/impl/go/v0.35/Makefile b/transport-interop/impl/go/v0.35/Makefile
new file mode 100644
index 0000000..3440fa4
--- /dev/null
+++ b/transport-interop/impl/go/v0.35/Makefile
@@ -0,0 +1,31 @@
+image_name := go-v0.35
+version := 0.35.0
+
+all: image.json
+
+image.json: verify-checksum go-libp2p-${version}
+	cd go-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+go-libp2p-${version}: go-libp2p-${version}.zip
+	unzip -o go-libp2p-${version}.zip
+
+go-libp2p-${version}.zip:
+	wget -O $@ "https://github.com/libp2p/go-libp2p/archive/v${version}.zip"
+
+# Run `make version.lock` to generate this lock file. This file should be commited.
+# This locks the exact contents of the specified version. This lets us use the
+# human readable name while still making sure the contents don't change.
+version.lock: go-libp2p-${version}.zip
+	shasum -a 256 go-libp2p-${version}.zip > $@
+
+verify-checksum: go-libp2p-${version}.zip
+	shasum -a 256 -c version.lock
+
+.PHONY: clean all verify-checksum
+
+clean:
+	rm image.json
+	rm go-libp2p-*.zip
+	rm -rf go-libp2p-*
diff --git a/transport-interop/impl/go/v0.35/version.lock b/transport-interop/impl/go/v0.35/version.lock
new file mode 100644
index 0000000..4102675
--- /dev/null
+++ b/transport-interop/impl/go/v0.35/version.lock
@@ -0,0 +1 @@
+535ef1d8984c5f79fcdbbd569e827aad9cd41d9168a2827f67182c99736caa31  go-libp2p-0.35.0.zip
diff --git a/transport-interop/versionsInput.json b/transport-interop/versionsInput.json
index 615b6a9..ea69c61 100644
--- a/transport-interop/versionsInput.json
+++ b/transport-interop/versionsInput.json
@@ -138,69 +138,6 @@
       "yamux"
     ]
   },
-  {
-    "id": "go-v0.32",
-    "transports": [
-      "tcp",
-      "ws",
-      "quic-v1",
-      "webrtc-direct"
-    ],
-    "secureChannels": [
-      "tls",
-      "noise"
-    ],
-    "muxers": [
-      "yamux"
-    ]
-  },
-  {
-    "id": "go-v0.31",
-    "transports": [
-      "tcp",
-      "ws",
-      "quic-v1"
-    ],
-    "secureChannels": [
-      "tls",
-      "noise"
-    ],
-    "muxers": [
-      "yamux"
-    ]
-  },
-  {
-    "id": "go-v0.30",
-    "transports": [
-      "tcp",
-      "ws",
-      "quic-v1"
-    ],
-    "secureChannels": [
-      "tls",
-      "noise"
-    ],
-    "muxers": [
-      "yamux"
-    ]
-  },
-  {
-    "id": "go-v0.29",
-    "transports": [
-      "tcp",
-      "ws",
-      "quic",
-      "quic-v1"
-    ],
-    "secureChannels": [
-      "tls",
-      "noise"
-    ],
-    "muxers": [
-      "mplex",
-      "yamux"
-    ]
-  },
   {
     "id": "nim-v1.0",
     "transports": [
@@ -268,5 +205,39 @@
       "mplex",
       "yamux"
     ]
+  },
+  {
+    "id": "go-v0.34",
+    "transports": [
+      "tcp",
+      "ws",
+      "quic-v1",
+      "webtransport",
+      "webrtc-direct"
+    ],
+    "secureChannels": [
+      "tls",
+      "noise"
+    ],
+    "muxers": [
+      "yamux"
+    ]
+  },
+  {
+    "id": "go-v0.35",
+    "transports": [
+      "tcp",
+      "ws",
+      "quic-v1",
+      "webtransport",
+      "webrtc-direct"
+    ],
+    "secureChannels": [
+      "tls",
+      "noise"
+    ],
+    "muxers": [
+      "yamux"
+    ]
   }
 ]