fix: logging consistency

ananas-block · ananas-block · commit ddcfc59f9bae · 2025-06-13T02:06:04.000+01:00
diff --git a/sdk-libs/program-test/src/program_test/light_program_test.rs b/sdk-libs/program-test/src/program_test/light_program_test.rs
@@ -71,12 +71,13 @@ impl LightProgramTest {
             .expect("forester airdrop failed.");
 
         if !config.skip_protocol_init {
+            let restore_logs = context.config.no_logs;
             if context.config.skip_startup_logs {
                 context.config.no_logs = true;
             }
             initialize_accounts(&mut context, &config, &keypairs).await?;
             if context.config.skip_startup_logs {
-                context.config.no_logs = false;
+                context.config.no_logs = restore_logs;
             }
             let batch_size = config
                 .v2_state_tree_config
diff --git a/sdk-libs/program-test/src/program_test/rpc.rs b/sdk-libs/program-test/src/program_test/rpc.rs
@@ -39,7 +39,9 @@ impl Rpc for LightProgramTest {
     where
         Self: Sized,
     {
-        unimplemented!()
+        Err(RpcError::CustomError(
+            "LightProgramTest::new is not supported in program-test context".into(),
+        ))
     }
 
     fn get_payer(&self) -> &Keypair {
@@ -146,14 +148,7 @@ impl Rpc for LightProgramTest {
 
                 RpcError::TransactionError(x.err)
             })?;
-            if !self.config.no_logs {
-                #[cfg(debug_assertions)]
-                {
-                    if std::env::var("RUST_BACKTRACE").is_ok() {
-                        println!("{}", _res.pretty_logs());
-                    }
-                }
-            }
+            self.maybe_print_logs(_res.pretty_logs());
         }
         Ok(sig)
     }
@@ -164,20 +159,12 @@ impl Rpc for LightProgramTest {
     ) -> Result<(Signature, Slot), RpcError> {
         let sig = *transaction.signatures.first().unwrap();
         let _res = self.context.send_transaction(transaction).map_err(|x| {
-            #[cfg(not(debug_assertions))]
-            {
-                if self.config.log_failed_tx {
-                    println!("{}", x.meta.pretty_logs());
-                }
+            if self.config.log_failed_tx {
+                println!("{}", x.meta.pretty_logs());
             }
             RpcError::TransactionError(x.err)
         })?;
-        #[cfg(debug_assertions)]
-        {
-            if std::env::var("RUST_BACKTRACE").is_ok() {
-                println!("{}", _res.pretty_logs());
-            }
-        }
+        self.maybe_print_logs(_res.pretty_logs());
 
         let slot = self.context.get_sysvar::<Clock>().slot;
         Ok((sig, slot))
@@ -303,6 +290,12 @@ impl Rpc for LightProgramTest {
 }
 
 impl LightProgramTest {
+    fn maybe_print_logs(&self, logs: impl std::fmt::Display) {
+        if !self.config.no_logs && cfg!(debug_assertions) && std::env::var("RUST_BACKTRACE").is_ok()
+        {
+            println!("{}", logs);
+        }
+    }
     #[cfg(feature = "v2")]
     pub fn get_address_tree_v2(&self) -> TreeInfo {
         TreeInfo {
@@ -474,20 +467,12 @@ impl LightProgramTest {
             });
         // If transaction was successful, execute it.
         let _res = self.context.send_transaction(transaction).map_err(|x| {
-            #[cfg(not(debug_assertions))]
-            {
-                if self.config.log_failed_tx {
-                    println!("{}", x.meta.pretty_logs());
-                }
+            if self.config.log_failed_tx {
+                println!("{}", x.meta.pretty_logs());
             }
             RpcError::TransactionError(x.err)
         })?;
-        #[cfg(debug_assertions)]
-        {
-            if std::env::var("RUST_BACKTRACE").is_ok() {
-                println!("{}", _res.pretty_logs());
-            }
-        }
+        self.maybe_print_logs(_res.pretty_logs());
 
         let slot = self.get_slot().await?;
         let result = event.map(|event| (event, signature, slot));

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,13 @@ impl LightProgramTest {`
`71`	`71`	`.expect("forester airdrop failed.");`
`72`	`72`
`73`	`73`	`if !config.skip_protocol_init {`
	`74`	`+ let restore_logs = context.config.no_logs;`
`74`	`75`	`if context.config.skip_startup_logs {`
`75`	`76`	`context.config.no_logs = true;`
`76`	`77`	`}`
`77`	`78`	`initialize_accounts(&mut context, &config, &keypairs).await?;`
`78`	`79`	`if context.config.skip_startup_logs {`
`79`		`- context.config.no_logs = false;`
	`80`	`+ context.config.no_logs = restore_logs;`
`80`	`81`	`}`
`81`	`82`	`let batch_size = config`
`82`	`83`	`.v2_state_tree_config`