e2e automatically installs avalanchego

automatically installs avalanchego

e2e test installs avalanchego via installer

e2e test installs avalanchego via installer

changed e2e tests

e2e fixes

Author: morrisettathena

scripts/tests.e2e.sh

@@ -7,50 +7,11 @@ if ! [[ "$0" =~ scripts/tests.e2e.sh ]]; then
   exit 255
 fi
 
-AVALANCHEGO_VERSION=$1
-if [[ -z "${AVALANCHEGO_VERSION}" ]]; then
-  echo "Missing avalanchego version argument!"
-  echo "Usage: ${0} [AVALANCHEGO_VERSION]" >> /dev/stderr
-  exit 255
-fi
-
-echo "Running with:"
-echo AVALANCHEGO_VERSION: ${AVALANCHEGO_VERSION}
-
-############################
-# download avalanchego
-# https://github.com/ava-labs/avalanchego/releases
-GOARCH=$(go env GOARCH)
-GOOS=$(go env GOOS)
-DOWNLOAD_URL=https://github.com/ava-labs/avalanchego/releases/download/v${AVALANCHEGO_VERSION}/avalanchego-linux-${GOARCH}-v${AVALANCHEGO_VERSION}.tar.gz
-DOWNLOAD_PATH=/tmp/avalanchego.tar.gz
-if [[ ${GOOS} == "darwin" ]]; then
-  DOWNLOAD_URL=https://github.com/ava-labs/avalanchego/releases/download/v${AVALANCHEGO_VERSION}/avalanchego-macos-v${AVALANCHEGO_VERSION}.zip
-  DOWNLOAD_PATH=/tmp/avalanchego.zip
-fi
-
-rm -rf /tmp/avalanchego-v${AVALANCHEGO_VERSION}
-rm -f ${DOWNLOAD_PATH}
-
-echo "downloading avalanchego ${AVALANCHEGO_VERSION} at ${DOWNLOAD_URL}"
-curl -L ${DOWNLOAD_URL} -o ${DOWNLOAD_PATH}
-
-echo "extracting downloaded avalanchego"
-if [[ ${GOOS} == "linux" ]]; then
-  tar xzvf ${DOWNLOAD_PATH} -C /tmp
-elif [[ ${GOOS} == "darwin" ]]; then
-  unzip ${DOWNLOAD_PATH} -d /tmp/avalanchego-build
-  mv /tmp/avalanchego-build/build /tmp/avalanchego-v${AVALANCHEGO_VERSION}
-fi
-find /tmp/avalanchego-v${AVALANCHEGO_VERSION}
-
-AVALANCHEGO_PATH=/tmp/avalanchego-v${AVALANCHEGO_VERSION}/avalanchego
-AVALANCHEGO_PLUGIN_DIR=/tmp/avalanchego-v${AVALANCHEGO_VERSION}/plugins
-
 #################################
 # download avalanche-network-runner
 # https://github.com/ava-labs/avalanche-network-runner
 # TODO: use "go install -v github.com/ava-labs/avalanche-network-runner/cmd/avalanche-network-runner@v${NETWORK_RUNNER_VERSION}"
+GOOS=$(go env GOOS) # ensures that the compatible network runner version is downloaded for this machine
 NETWORK_RUNNER_VERSION=1.1.0
 DOWNLOAD_PATH=/tmp/avalanche-network-runner.tar.gz
 DOWNLOAD_URL=https://github.com/ava-labs/avalanche-network-runner/releases/download/v${NETWORK_RUNNER_VERSION}/avalanche-network-runner_${NETWORK_RUNNER_VERSION}_linux_amd64.tar.gz
@@ -77,12 +38,12 @@ server \
 --port=":12342" \
 --grpc-gateway-port=":12343" &
 NETWORK_RUNNER_PID=${!}
+sleep 5 # sleep to ensure that network runner initializes before e2e tests begin
 
 #################################
 # do not run in parallel, to run in sequence
 echo "running e2e tests"
 NETWORK_RUNNER_GRPC_ENDPOINT=http://127.0.0.1:12342 \
-NETWORK_RUNNER_AVALANCHEGO_PATH=${AVALANCHEGO_PATH} \
 RUST_LOG=debug \
 cargo test --all-features --package e2e -- --show-output --nocapture
 

tests/e2e/Cargo.toml

@@ -11,6 +11,7 @@ homepage = "https://avax.network"
 [dependencies]
 
 [dev-dependencies]
+avalanche-installer = "0.0.3"
 avalanche-network-runner-sdk = { version = "0.0.1" }
 env_logger = "0.9.0"
 log = "0.4.17"

tests/e2e/src/tests/mod.rs

@@ -1,6 +1,7 @@
 use std::{
     thread,
     time::{Duration, Instant},
+    process::Command
 };
 
 use log::{info, warn};
@@ -23,8 +24,19 @@ async fn e2e() {
     let resp = cli.ping().await.expect("failed ping");
     info!("network-runner is running (ping response {:?})", resp);
 
-    let (exec_path, is_set) = get_network_runner_avalanchego_path();
-    assert!(is_set);
+    // Attempt to find network_runner_path.  If not set, try to get the avalanchego_path.
+    // If no avalanchego_path, automatically install new version
+    let (mut exec_path, is_set) = get_avalanchego_path();
+    if !is_set {
+        info!("avalanchego_path not set, installing to temp");
+        
+        let (path, _) = avalanche_installer::avalanchego::download(None, None)
+            .await
+            .expect("failed to download avalanchego");
+        exec_path = path;
+    }
+    
+    info!("running avalanchego version {}", get_avalanchego_version(&exec_path));
 
     let global_config = GlobalConfig {
         log_level: String::from("info"),
@@ -108,15 +120,24 @@ async fn e2e() {
     info!("successfully stopped network");
 }
 
+fn get_avalanchego_version(exec_path: &String) -> String {
+    let output = Command::new(exec_path)
+        .arg("--version")
+        .output()
+        .expect("failed to get avalanchego version");
+    format!("{}", String::from_utf8(output.stdout).unwrap())
+    
+}
+
 fn get_network_runner_grpc_endpoint() -> (String, bool) {
     match std::env::var("NETWORK_RUNNER_GRPC_ENDPOINT") {
         Ok(s) => (s, true),
         _ => (String::new(), false),
     }
 }
 
-fn get_network_runner_avalanchego_path() -> (String, bool) {
-    match std::env::var("NETWORK_RUNNER_AVALANCHEGO_PATH") {
+fn get_avalanchego_path() -> (String, bool) {
+    match std::env::var("AVALANCHEGO_PATH") {
         Ok(s) => (s, true),
         _ => (String::new(), false),
     }