From 3cbae2d27abe079a217dab695011b4696120cd81 Mon Sep 17 00:00:00 2001
From: Teddy Ding <teddy@dydx.exchange>
Date: Tue, 15 Oct 2024 16:00:26 -0400
Subject: [PATCH] Revert "Build image with different pre and post upgrade
 versions for testnet (#2187)"

This reverts commit c965b80a50938e6908bef7c1858f10a39ca8a968.
---
 protocol/testing/testnet/testnet.sh | 6 +++---
 protocol/testing/version/version.sh | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/protocol/testing/testnet/testnet.sh b/protocol/testing/testnet/testnet.sh
index b60eee37988..903ed4bbaf2 100755
--- a/protocol/testing/testnet/testnet.sh
+++ b/protocol/testing/testnet/testnet.sh
@@ -16,11 +16,11 @@ install_prerequisites() {
 
 set_cosmovisor_binary_permissions() {
     # Set up upgrade binaries.
-    for version in "${!testnet_version_to_url[@]}"; do
+    for version in "${!version_to_url[@]}"; do
         echo "Setting up version ${version}..."
         version_dir="$HOME/cosmovisor/upgrades/$version"
         mkdir -p "$version_dir/bin"
-        url=${testnet_version_to_url[$version]}
+        url=${version_to_url[$version]}
         tar_file=$(basename $url)
 
         echo "Downloading tar file from ${url}..."
@@ -32,7 +32,7 @@ set_cosmovisor_binary_permissions() {
         chmod 755 "$version_dir/bin/dydxprotocold"
         echo "Successfully set up $version_dir/bin/dydxprotocold"
     done
-    current_version_path="$HOME/cosmovisor/upgrades/$TESTNET_CURRENT_VERSION/bin"
+    current_version_path="$HOME/cosmovisor/upgrades/$CURRENT_VERSION/bin"
     mkdir -p $current_version_path
     cp /bin/dydxprotocold $current_version_path
 }
diff --git a/protocol/testing/version/version.sh b/protocol/testing/version/version.sh
index 469f7a9ec84..6465b7f6ee7 100755
--- a/protocol/testing/version/version.sh
+++ b/protocol/testing/version/version.sh
@@ -3,12 +3,6 @@ CURRENT_VERSION=$(<VERSION_CURRENT)
 PREUPGRADE_VERSION=$(<VERSION_PREUPGRADE)
 PREUPGRADE_VERSION_FULL_NAME=$(<VERSION_FULL_NAME_PREUPGRADE)
 
-TESTNET_CURRENT_VERSION="v6.0.0_testnet_fix"
-TESTNET_PREUPGRADE_VERSION="v6.0.0"
-TESTNET_PREUPGRADE_VERSION_FULL_NAME="v6.0.2"
-
 # Define the mapping from version to amd64 URL
 declare -A version_to_url
 version_to_url["$PREUPGRADE_VERSION"]="https://github.com/dydxprotocol/v4-chain/releases/download/protocol%2F$PREUPGRADE_VERSION_FULL_NAME/dydxprotocold-$PREUPGRADE_VERSION_FULL_NAME-linux-amd64.tar.gz"
-declare -A testnet_version_to_url
-testnet_version_to_url["$TESTNET_PREUPGRADE_VERSION"]="https://github.com/dydxprotocol/v4-chain/releases/download/protocol%2F$TESTNET_PREUPGRADE_VERSION_FULL_NAME/dydxprotocold-$TESTNET_PREUPGRADE_VERSION_FULL_NAME-linux-amd64.tar.gz"
\ No newline at end of file