From 9ac5af38bffcc8e31b7d8afa7f701bf6bc2d884f Mon Sep 17 00:00:00 2001
From: Marco Munizaga <marco@marcopolo.io>
Date: Fri, 17 Feb 2023 14:47:03 -0800
Subject: [PATCH] Add backported Rust versions (#134)

* Add backported Rust versions

* Update v0.48 to merge backport commit

* Reference backport commit

* Reference backport commit for v049

---------

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
---
 multidim-interop/rust/{v0.50 => }/.gitignore |  0
 multidim-interop/rust/v0.48/Makefile         | 20 ++++++++++++++++++++
 multidim-interop/rust/v0.49/Makefile         | 20 ++++++++++++++++++++
 multidim-interop/rust/v0.50/Makefile         |  4 ++--
 multidim-interop/versions.ts                 | 16 ++++++++++++++++
 5 files changed, 58 insertions(+), 2 deletions(-)
 rename multidim-interop/rust/{v0.50 => }/.gitignore (100%)
 create mode 100644 multidim-interop/rust/v0.48/Makefile
 create mode 100644 multidim-interop/rust/v0.49/Makefile

diff --git a/multidim-interop/rust/v0.50/.gitignore b/multidim-interop/rust/.gitignore
similarity index 100%
rename from multidim-interop/rust/v0.50/.gitignore
rename to multidim-interop/rust/.gitignore
diff --git a/multidim-interop/rust/v0.48/Makefile b/multidim-interop/rust/v0.48/Makefile
new file mode 100644
index 0000000..a461d1f
--- /dev/null
+++ b/multidim-interop/rust/v0.48/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-v0.48
+commitSha := 7b3047d6d05d599f11f05938d4257e70de66ac12
+
+all: image.json
+
+image.json: rust-libp2p-${commitSha}
+	cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip
+	unzip -o rust-libp2p-${commitSha}.zip
+
+rust-libp2p-${commitSha}.zip:
+	wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip"
+
+clean:
+	rm image.json
+	rm rust-libp2p-*.zip
+	rm -rf rust-libp2p-*
diff --git a/multidim-interop/rust/v0.49/Makefile b/multidim-interop/rust/v0.49/Makefile
new file mode 100644
index 0000000..9029e17
--- /dev/null
+++ b/multidim-interop/rust/v0.49/Makefile
@@ -0,0 +1,20 @@
+image_name := rust-v0.49
+commitSha := 582c84043050eb0dd6e52d1bd0527175181d41cb
+
+all: image.json
+
+image.json: rust-libp2p-${commitSha}
+	cd rust-libp2p-${commitSha} && IMAGE_NAME=${image_name} ../../../dockerBuildWrapper.sh -f interop-tests/Dockerfile .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+rust-libp2p-${commitSha}: rust-libp2p-${commitSha}.zip
+	unzip -o rust-libp2p-${commitSha}.zip
+
+rust-libp2p-${commitSha}.zip:
+	wget -O $@ "https://github.com/libp2p/rust-libp2p/archive/${commitSha}.zip"
+
+clean:
+	rm image.json
+	rm rust-libp2p-*.zip
+	rm -rf rust-libp2p-*
diff --git a/multidim-interop/rust/v0.50/Makefile b/multidim-interop/rust/v0.50/Makefile
index acb9d04..2cc4892 100644
--- a/multidim-interop/rust/v0.50/Makefile
+++ b/multidim-interop/rust/v0.50/Makefile
@@ -1,5 +1,5 @@
 image_name := rust-v0.50
-commitSha := 1f0f0e240cc25480d1b5fb488abfb69bf06812f0
+commitSha := beb66b5832384d9b813fcbf1f0fa01e6a64a9c5f
 
 all: image.json
 
@@ -17,4 +17,4 @@ rust-libp2p-${commitSha}.zip:
 clean:
 	rm image.json
 	rm rust-libp2p-*.zip
-	rm -rf rust-libp2p-*
\ No newline at end of file
+	rm -rf rust-libp2p-*
diff --git a/multidim-interop/versions.ts b/multidim-interop/versions.ts
index 45aeea5..0615980 100644
--- a/multidim-interop/versions.ts
+++ b/multidim-interop/versions.ts
@@ -2,6 +2,8 @@ import gov025 from "./go/v0.25/image.json"
 import gov024 from "./go/v0.24/image.json"
 import gov023 from "./go/v0.23/image.json"
 import gov022 from "./go/v0.22/image.json"
+import rustv048 from "./rust/v0.48/image.json"
+import rustv049 from "./rust/v0.49/image.json"
 import rustv050 from "./rust/v0.50/image.json"
 import jsV041 from "./js/v0.41/node-image.json"
 import nimv10 from "./nim/v1.0/image.json"
@@ -18,6 +20,20 @@ export type Version = {
 }
 
 export const versions: Array<Version> = [
+    {
+        id: "rust-v0.48.0",
+        containerImageID: rustv050.imageID,
+        transports: ["ws", "tcp"],
+        secureChannels: ["noise"],
+        muxers: ["mplex", "yamux"],
+    },
+    {
+        id: "rust-v0.49.0",
+        containerImageID: rustv050.imageID,
+        transports: ["ws", "tcp"],
+        secureChannels: ["noise"],
+        muxers: ["mplex", "yamux"],
+    },
     {
         id: "rust-v0.50.0",
         containerImageID: rustv050.imageID,