rpc-client: Print transaction logs in preflight error (solana-labs#1387)

* rpc-client: Print transaction logs in preflight error * Address feedback * Update expected error message in program deploy test * Use a semicolon before the data
brooksprumo · May 17, 2024 · 4f6dd3d · 4f6dd3d
1 parent 664bf10
commit 4f6dd3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/cli/tests/program.rs b/cli/tests/program.rs
@@ -860,7 +860,10 @@ fn test_cli_program_upgrade_auto_extend() {
          RPC response error -32002: \
          Transaction simulation failed: \
          Error processing Instruction 0: \
-         account data too small for instruction [3 log messages]",
+         account data too small for instruction; 3 log messages:\n  \
+         Program BPFLoaderUpgradeab1e11111111111111111111111 invoke [1]\n  \
+         ProgramData account not large enough\n  \
+         Program BPFLoaderUpgradeab1e11111111111111111111111 failed: account data too small for instruction\n",
     );
 
     // Attempt to upgrade the program with a larger program, this time without
@@ -1147,7 +1150,10 @@ fn test_cli_program_extend_program() {
          RPC response error -32002: \
          Transaction simulation failed: \
          Error processing Instruction 0: \
-         account data too small for instruction [3 log messages]",
+         account data too small for instruction; 3 log messages:\n  \
+         Program BPFLoaderUpgradeab1e11111111111111111111111 invoke [1]\n  \
+         ProgramData account not large enough\n  \
+         Program BPFLoaderUpgradeab1e11111111111111111111111 failed: account data too small for instruction\n",
     );
 
     // Wait one slot to avoid "Program was deployed in this block already" error

diff --git a/rpc-client-api/src/request.rs b/rpc-client-api/src/request.rs
@@ -243,8 +243,11 @@ impl fmt::Display for RpcResponseErrorData {
                 if logs.is_empty() {
                     Ok(())
                 } else {
-                    // Give the user a hint that there is more useful logging information available...
-                    write!(f, "[{} log messages]", logs.len())
+                    writeln!(f, "{} log messages:", logs.len())?;
+                    for log in logs {
+                        writeln!(f, "  {log}")?;
+                    }
+                    Ok(())
                 }
             }
             _ => Ok(()),
@@ -256,7 +259,7 @@ impl fmt::Display for RpcResponseErrorData {
 pub enum RpcError {
     #[error("RPC request error: {0}")]
     RpcRequestError(String),
-    #[error("RPC response error {code}: {message} {data}")]
+    #[error("RPC response error {code}: {message}; {data}")]
     RpcResponseError {
         code: i64,
         message: String,