refactor: contract fixtures and simplification

Author: Daanvdplas

.github/workflows/integration-tests.yml

@@ -52,11 +52,11 @@ jobs:
           sudo apt-get clean &
           wait
 
-      - name: Install stable toolchain
+      - name: Install Rust 1.91 toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: 1.91.0
           default: true
           target: wasm32-unknown-unknown
           components: rust-src, clippy
@@ -81,11 +81,16 @@ jobs:
           key: pop-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
 
       - name: Install pop
-        run: cargo install --locked --force pop-cli
+        run: cargo install --locked --force --git https://github.com/r0gue-io/pop-cli --branch main
 
       - name: Bootstrap pop binaries
         run: sudo "$(which pop)" install -y
 
+      - name: Smoke test ink-node
+        run: |
+          pop up ink-node -y --detach
+          pop clean node --all
+
       - name: Run integration tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "stable"
+channel = "1.91.0"
 profile = "minimal"
 components = ["rustfmt", "clippy", "rust-src", "llvm-tools-preview"]
 targets = ["wasm32-unknown-unknown"]

src/executor.rs

@@ -1,7 +1,5 @@
 //! Command execution for Pop CLI
 
-#[cfg(feature = "pop-e2e")]
-use std::ffi::OsString;
 #[cfg(feature = "pop-e2e")]
 use std::path::PathBuf;
 use std::process::Command;
@@ -43,49 +41,31 @@ impl CommandOutput {
 /// Real implementation of Pop CLI command executor.
 ///
 /// When the `pop-e2e` feature is enabled, the executor supports optional
-/// working directory and environment overrides for test isolation.
+/// working directory override for test isolation.
 #[derive(Debug, Clone, Default)]
 pub struct PopExecutor {
-    /// Override working directory for command execution (pop-e2e only).
     #[cfg(feature = "pop-e2e")]
     cwd: Option<PathBuf>,
-    /// Environment variable overrides (pop-e2e only).
-    #[cfg(feature = "pop-e2e")]
-    env: Vec<(OsString, OsString)>,
 }
 
 impl PopExecutor {
     pub fn new() -> Self {
         Self::default()
     }
 
-    /// Create an executor with working directory and environment overrides.
-    ///
-    /// This is only available in `pop-e2e` builds for test isolation.
+    /// Create an executor with a working directory override.
     #[cfg(feature = "pop-e2e")]
-    pub fn with_overrides(
-        cwd: Option<PathBuf>,
-        env: impl IntoIterator<Item = (impl Into<OsString>, impl Into<OsString>)>,
-    ) -> Self {
-        Self {
-            cwd,
-            env: env.into_iter().map(|(k, v)| (k.into(), v.into())).collect(),
-        }
+    pub fn with_cwd(cwd: PathBuf) -> Self {
+        Self { cwd: Some(cwd) }
     }
 
     fn execute_raw(&self, args: &[&str]) -> PopMcpResult<CommandOutput> {
         let mut cmd = Command::new("pop");
         cmd.args(args);
 
-        // Apply overrides when pop-e2e feature is enabled
         #[cfg(feature = "pop-e2e")]
-        {
-            if let Some(ref cwd) = self.cwd {
-                cmd.current_dir(cwd);
-            }
-            if !self.env.is_empty() {
-                cmd.envs(self.env.iter().map(|(k, v)| (k, v)));
-            }
+        if let Some(ref cwd) = self.cwd {
+            cmd.current_dir(cwd);
         }
 
         let output = cmd.output().map_err(|e| {