Clean-up integration tests and Namada bootstrap

heliaxdev · Jun 6, 2024 · 76d3055 · 76d3055
1 parent f465d2f
commit 76d3055
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 41 deletions.
diff --git a/.github/workflows/namada.yaml b/.github/workflows/namada.yaml
@@ -49,8 +49,6 @@ jobs:
       - name: Retrieve Namada repository path
         id: namada-repo-path
         run: |
-          ls
-          pwd
           echo "NAMADA_REPO_PATH=$(pwd)/namada" >> "$GITHUB_ENV"
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
@@ -114,7 +112,6 @@ jobs:
           ACCOUNT_PREFIXES: ${{ matrix.chain.account_prefix }}
           NATIVE_TOKENS: ${{ matrix.chain.native_token }}
         run: |
-          tree $NAMADA_REPO_PATH
           nix shell ${{ matrix.chain.package }} -c \
             cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=1 \
             --features namada
@@ -165,7 +162,10 @@ jobs:
           release_url=$(curl -s "https://api.github.com/repos/anoma/namada/releases/v0.37.0" | grep "browser_download_url" | cut -d '"' -f 4 | grep "$OPERATING_SYSTEM")
           wget "$release_url"
           tar -xzvf namada*.tar.gz
-          sudo cp ./namada* ~/local/bin/
+          cp ./namada*/namadac ~/local/bin/namadac
+          cp ./namada*/namadan ~/local/bin/namadan
+          cp ./namada*/namadaw ~/local/bin/namadaw
+          cp ./namada*/namada ~/local/bin/namada
       - name: Update environment path
         run: |
           echo "${HOME}/local/bin" >> $GITHUB_PATH
@@ -184,7 +184,6 @@ jobs:
           ACCOUNT_PREFIXES: ''
           NATIVE_TOKENS: nam
         run: |
-          tree $NAMADA_REPO_PATH
           cargo nextest run -p ibc-integration-test --no-fail-fast --failure-output final --test-threads=1 \
             --features namada
 
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
     flake-utils.url = github:numtide/flake-utils;
-    cosmos-nix.url = github:informalsystems/cosmos.nix/luca_joss/expose-namada-repository;
+    cosmos-nix.url = github:informalsystems/cosmos.nix;
   };
 
   outputs = inputs: let
@@ -42,8 +42,6 @@
           ibc-go-v8-simapp
           interchain-security
           migaloo
-          namada
-          namada-src
           neutron
           juno
           osmosis

diff --git a/tools/integration-test/src/tests/mod.rs b/tools/integration-test/src/tests/mod.rs
@@ -31,6 +31,7 @@ pub mod memo;
 #[cfg(not(feature = "namada"))]
 pub mod python;
 pub mod query_packet;
+#[cfg(not(feature = "namada"))]
 pub mod supervisor;
 #[cfg(not(feature = "namada"))]
 pub mod tendermint;

diff --git a/tools/test-framework/src/bootstrap/namada.rs b/tools/test-framework/src/bootstrap/namada.rs
@@ -89,10 +89,8 @@ pub fn bootstrap_namada_node(
     // Init network
     let output = simple_exec_with_envs(
         "namada",
-        //&chain_driver.command_path,
         "namadac",
         &[
-            //"client",
             "utils",
             "init-network",
             "--chain-prefix",
@@ -116,12 +114,10 @@ pub fn bootstrap_namada_node(
 
     simple_exec_with_envs(
         &chain_id,
-        //&chain_driver.command_path,
         "namadac",
         &[
             "--base-dir",
             validator_base_dir,
-            //"client",
             "utils",
             "join-network",
             "--chain-id",
@@ -140,10 +136,8 @@ pub fn bootstrap_namada_node(
 
     simple_exec_with_envs(
         &chain_id,
-        //&chain_driver.command_path,
         "namadac",
         &[
-            //"client",
             "--base-dir",
             home_path,
             "utils",