add test comments and error propagation

Author: naijauser

cli/tests/execute_block.rs

@@ -25,6 +25,13 @@ use regex::Regex;
 use substrate_cli_test_utils as common;
 use tokio::process::Command;
 
+/*
+ * Test that `execute-block` works as expectd.
+ * It covers three scenarios:
+ *   1. Passing --at to execute a specific block.
+ *   2. Not passing --at to execute the latest block.
+ *   3. Passing --from and --to to execute a range of blocks.
+ */
 #[tokio::test]
 async fn execute_block_works() {
     let port = 45789;
@@ -45,7 +52,7 @@ async fn execute_block_works() {
     // Wait some time to ensure the node is warmed up.
     std::thread::sleep(Duration::from_secs(90));
 
-    // Test passing --at
+    // 1. Test passing --at to execute a specific block.
     common::run_with_timeout(Duration::from_secs(60), async move {
         let ws_url = format!("ws://localhost:{}", port);
 
@@ -87,7 +94,7 @@ async fn execute_block_works() {
     })
     .await;
 
-    // Test not passing --at
+    // 2. Test not passing --at should execute the latest block.
     common::run_with_timeout(Duration::from_secs(60), async move {
         let ws_url = format!("ws://localhost:{}", port);
 
@@ -123,7 +130,7 @@ async fn execute_block_works() {
     })
     .await;
 
-    // Test passing --from and --to to execute a range of blocks.
+    // 3. Test passing --from and --to to execute a range of blocks.
     common::run_with_timeout(Duration::from_secs(120), async move {
         let ws_url = format!("ws://localhost:{}", port);
         let from = 3u64;
@@ -153,6 +160,13 @@ async fn execute_block_works() {
         // Assert that all blocks in the range were executed.
         assert!(matched.is_ok());
 
+        // Assert that the block after is not executed.
+        let expected_output = format!(r#".*Block #{} successfully executed"#, to + 1);
+        let re = Regex::new(expected_output.as_str()).unwrap();
+        let matched =
+            common::wait_for_stream_pattern_match(block_execution.stderr.take().unwrap(), re).await;
+        assert!(matched.is_err());
+
         // Assert that the block-execution exited successfully.
         assert!(block_execution
             .wait_with_output()

core/src/commands/execute_block.rs

@@ -152,7 +152,7 @@ where
 
                 let _ =
                     execute_block::<Block, HostFns>(&shared, &command, &executor, &rpc, live_state)
-                        .await;
+                        .await?;
             }
         }