install avalanchego & subnetevm via avalanche-cli

.github/workflows/test.yml

@@ -73,6 +73,9 @@ jobs:
       - name: Install Foundry
         run: ./scripts/install_foundry.sh
 
+      - name: Install avalanche-cli
+        run: curl -sSfL https://raw.githubusercontent.com/ava-labs/avalanche-cli/main/scripts/install.sh | sh -s -- -b /usr/local/bin v1.5.3
+
       - name: Run E2E Tests
         # Forge installs to BASE_DIR, but updates the PATH definition in $HOME/.bashrc
         run: |

README.md

@@ -125,7 +125,7 @@ source vars.sh                # source the variables needed to interact with the
 
 In addition to the docker setup, end-to-end integration tests written using Ginkgo are provided in the `tests/` directory. E2E tests are run as part of CI, but can also be run locally. Any new features or cross-chain example applications checked into the repository should be accompanied by an end-to-end tests. See the [Contribution Guide](./CONTRIBUTING.md) for additional details.
 
-To run the E2E tests locally, you'll need to install Gingko following the instructions [here](https://onsi.github.io/ginkgo/#installing-ginkgo).
+To run the E2E tests locally, you'll need to install Gingko following the instructions [here](https://onsi.github.io/ginkgo/#installing-ginkgo), and avalanche-cli as instructed [here](https://docs.avax.network/tooling/cli-guides/install-avalanche-cli).
 
 Then run the following command from the root of the repository:
 

scripts/local/e2e_test.sh

@@ -15,15 +15,34 @@ source "$TELEPORTER_PATH"/scripts/versions.sh
 BASEDIR=${BASEDIR:-"$HOME/.teleporter-deps"}
 
 cwd=$(pwd)
-# Install the avalanchego and subnet-evm binaries
-rm -rf $BASEDIR/avalanchego
-BASEDIR=$BASEDIR AVALANCHEGO_BUILD_PATH=$BASEDIR/avalanchego ./scripts/install_avalanchego_release.sh
-BASEDIR=$BASEDIR ./scripts/install_subnetevm_release.sh
 
-cp ${BASEDIR}/subnet-evm/subnet-evm ${BASEDIR}/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
-echo "Copied ${BASEDIR}/subnet-evm/subnet-evm binary to ${BASEDIR}/avalanchego/plugins/"
+AVALANCHE_CLI_DIR=$HOME/.avalanche-cli
 
-export AVALANCHEGO_BUILD_PATH=$BASEDIR/avalanchego
+export AVALANCHEGO_BUILD_PATH=${AVALANCHE_CLI_DIR}/bin/avalanchego/avalanchego-${AVALANCHEGO_VERSION}
+
+# ensure that avalanche-cli has installed the version of avalanchego that we need:
+if [[ ! -x "$AVALANCHEGO_BUILD_PATH/avalanchego" ]]; then
+  avalanche network clean
+  avalanche network start --avalanchego-version "$AVALANCHEGO_VERSION"
+  avalanche network clean
+fi
+
+# ensure that avalanche-cli has installed the version of subnetevm that we need:
+subnetevm_bin=${AVALANCHE_CLI_DIR}/bin/subnet-evm/subnet-evm-${SUBNET_EVM_VERSION}/subnet-evm
+if [[ ! -x "$subnetevm_bin" ]]; then
+  avalanche subnet create dummy --evm --vm-version "$SUBNET_EVM_VERSION" \
+    --force \
+    --teleporter --relayer --evm-chain-id 1 --evm-token DUM --evm-defaults # this line is just to avoid the dialog prompts
+fi
+
+# Install the subnet-evm binary as a plugin within the avalanche-cli resources.
+# This is a hack that can probably be undone when we stop setting up the
+# avalanche network and subnet ourselves (via BeforeSuite/AfterSuite in
+# tests/local/e2e_test.go) and start having avalanche-cli do that for us
+# instead.
+mkdir -p "${AVALANCHEGO_BUILD_PATH}/plugins"
+cp "$subnetevm_bin" \
+  "${AVALANCHEGO_BUILD_PATH}/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy"
 
 cd $TELEPORTER_PATH/contracts
 if command -v forge &> /dev/null; then