refactor: clean up unused imports and fix path references in tests

Author: agentfarmx[bot]

src/main.rs

@@ -730,7 +730,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 #[cfg(test)]
 mod test {
     use borsh::{BorshDeserialize, BorshSerialize};
-    use solana_sdk::borsh::try_from_slice_unchecked;
     use solana_sdk::pubkey::Pubkey;
 
     #[test]
@@ -753,4 +752,4 @@ mod test {
         // Assert that the deserialized data matches the original
         assert_eq!(faux, in_faux);
     }
-}
+}

src/utils/ssh_deploy/tests/unit.rs

@@ -4,7 +4,6 @@
 mod tests {
     use {
         crate::utils::ssh_deploy::{
-            errors::DeploymentError,
             services::{create_binary_service_content, create_docker_service_content},
             types::{AuthMethod, DeploymentConfig, NetworkType, ServerConfig},
             validators::{
@@ -244,4 +243,4 @@ mod tests {
         assert!(service_content.contains("--arg1 value1"));
         assert!(service_content.contains("--arg2 value2"));
     }
-}
+}

tests/e2e/common.rs

@@ -1,8 +1,7 @@
 //! Common utilities for e2e tests
 
 use assert_cmd::prelude::*;
-use mockito::Server;
-use predicates::prelude::*;
+use mockito::ServerGuard;
 use std::env;
 use std::path::PathBuf;
 use std::process::Command;
@@ -57,7 +56,7 @@ pub fn create_mock_config(dir: &TempDir) -> PathBuf {
 
 /// Mock server for testing SSH deployment
 pub struct MockServer {
-    pub server: Server,
+    pub server: mockito::ServerGuard,
 }
 
 impl MockServer {
@@ -74,7 +73,7 @@ impl MockServer {
     }
 
     /// Mock an SVM list endpoint
-    pub fn mock_svm_list(&self) -> mockito::Mock {
+    pub fn mock_svm_list(&mut self) -> mockito::Mock {
         self.server.mock("GET", "/api/svms")
             .with_status(200)
             .with_header("content-type", "application/json")
@@ -83,21 +82,21 @@ impl MockServer {
     }
 
     /// Mock an SVM get endpoint
-    pub fn mock_svm_get(&self, svm_name: &str) -> mockito::Mock {
-        self.server.mock("GET", &format!("/api/svms/{}", svm_name))
+    pub fn mock_svm_get(&mut self, svm_name: &str) -> mockito::Mock {
+        self.server.mock("GET", format!("/api/svms/{}", svm_name).as_str())
             .with_status(200)
             .with_header("content-type", "application/json")
             .with_body(format!(r#"{{"name":"{}","display_name":"{}","token_symbol":"TEST","token_price_usd":1.0}}"#, svm_name, svm_name.to_uppercase()))
             .create()
     }
 
     /// Mock an SVM get endpoint with 404 response
-    pub fn mock_svm_get_not_found(&self, svm_name: &str) -> mockito::Mock {
+    pub fn mock_svm_get_not_found(&mut self, svm_name: &str) -> mockito::Mock {
         self.server
-            .mock("GET", &format!("/api/svms/{}", svm_name))
+            .mock("GET", format!("/api/svms/{}", svm_name).as_str())
             .with_status(404)
             .with_header("content-type", "application/json")
             .with_body(format!(r#"{{"error":"SVM not found: {}"}}"#, svm_name))
             .create()
     }
-}
+}

tests/e2e/examples.rs

@@ -1,6 +1,7 @@
 //! Example tests to demonstrate how to write e2e tests
 
-use crate::tests::e2e::common::{
+use assert_cmd::assert::OutputAssertExt;
+use crate::e2e::common::{
     create_mock_config, create_temp_dir, output_contains, run_osvm_command,
     run_osvm_command_string, MockServer,
 };
@@ -40,7 +41,7 @@ fn example_test_with_assert_cmd() {
 #[serial]
 fn example_test_with_mock_server() {
     // Create a mock server
-    let mock_server = MockServer::new();
+    let mut mock_server = MockServer::new();
 
     // Set up a mock endpoint
     let _mock = mock_server.mock_svm_list();
@@ -73,4 +74,4 @@ fn example_test_with_custom_config() {
 
     // Check if the output contains expected text
     assert!(output_contains(&output, "Available SVMs in the chain:"));
-}
+}

tests/e2e/node_tests.rs

@@ -1,8 +1,9 @@
 //! End-to-end tests for node-related commands
 
-use crate::tests::e2e::common::{
+use assert_cmd::assert::OutputAssertExt;
+use crate::e2e::common::{
     create_mock_config, create_temp_dir, output_contains, run_osvm_command,
-    run_osvm_command_string, MockServer,
+    run_osvm_command_string,
 };
 use predicates::prelude::*;
 use serial_test::serial;
@@ -156,4 +157,4 @@ fn test_help_command() {
         .stdout(predicate::str::contains("USAGE:"))
         .stdout(predicate::str::contains("FLAGS:"))
         .stdout(predicate::str::contains("SUBCOMMANDS:"));
-}
+}

tests/e2e/svm_tests.rs

@@ -1,6 +1,12 @@
 //! End-to-end tests for SVM-related commands
 
-use crate::tests::e2e::common::{output_contains, run_osvm_command, run_osvm_command_string};
+use assert_cmd::assert::OutputAssertExt;
+use crate::e2e::common::{
+    create_mock_config, create_temp_dir, output_contains, run_osvm_command,
+    run_osvm_command_string, MockServer,
+};
+use predicates::prelude::*;
+use serial_test::serial;
 
 #[test]
 fn test_svm_list() {
@@ -39,14 +45,15 @@ fn test_svm_get_solana() {
 
 #[test]
 fn test_svm_get_invalid() {
-    let output = run_osvm_command(&["svm", "get", "invalid_svm"]);
+    // Use assert_cmd to run a command and make assertions about the output
+    let assert = run_osvm_command()
+        .args(&["svm", "get", "invalid_svm"])
+        .assert();
 
     // Verify the command fails with a non-zero exit code
-    assert!(!output.status.success());
-
-    // Verify the error message
-    let error = String::from_utf8_lossy(&output.stderr);
-    assert!(error.contains("SVM not found") || error.contains("Error:"));
+    assert
+        .failure()
+        .stderr(predicate::str::contains("SVM not found").or(predicate::str::contains("Error:")));
 }
 
 #[test]
@@ -79,7 +86,7 @@ fn test_svm_with_config_file() {
 #[serial]
 fn test_svm_with_url() {
     // Create a mock server
-    let mock_server = MockServer::new();
+    let mut mock_server = MockServer::new();
     let _mock = mock_server.mock_svm_list();
 
     // Run the command with a custom URL
@@ -92,4 +99,4 @@ fn test_svm_with_url() {
 
     // Verify the output contains expected headers
     assert!(output_contains(&output, "Available SVMs in the chain:"));
-}
+}