Merge branch 'main' into install-additional-deb

stellar · Sep 9, 2024 · fde4b3e · fde4b3e
2 parents fc303b7 + e3a3214
commit fde4b3e
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 140 deletions.
diff --git a/cmd/crates/soroban-test/tests/it/integration/dotenv.rs b/cmd/crates/soroban-test/tests/it/integration/dotenv.rs
@@ -42,7 +42,7 @@ async fn current_env_not_overwritten() {
         .arg("--world=world")
         .assert()
         .stderr(
-            "error: Contract not found: CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4\n",
+            "❌ error: Contract not found: CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4\n",
         );
 }
 

diff --git a/cmd/crates/soroban-test/tests/it/integration/hello_world.rs b/cmd/crates/soroban-test/tests/it/integration/hello_world.rs
@@ -243,7 +243,7 @@ fn contract_data_read_failure(sandbox: &TestEnv, id: &str) {
         .assert()
         .failure()
         .stderr(
-            "error: no matching contract data entries were found for the specified contract id\n",
+            "❌ error: no matching contract data entries were found for the specified contract id\n",
         );
 }
 

diff --git a/cmd/soroban-cli/src/cli.rs b/cmd/soroban-cli/src/cli.rs
@@ -4,7 +4,7 @@ use std::thread;
 use tracing_subscriber::{fmt, EnvFilter};
 
 use crate::upgrade_check::upgrade_check;
-use crate::{commands, Root};
+use crate::{commands, print, Root};
 
 #[tokio::main]
 pub async fn main() {
@@ -79,8 +79,9 @@ pub async fn main() {
         upgrade_check(root.global_args.quiet);
     });
 
+    let printer = print::Print::new(root.global_args.quiet);
     if let Err(e) = root.run().await {
-        eprintln!("error: {e}");
+        printer.errorln(format!("error: {e}"));
         std::process::exit(1);
     }
 }