fix conflicts

Author: naijauser

cli/tests/offchain_worker.rs

@@ -25,6 +25,13 @@ use regex::Regex;
 use substrate_cli_test_utils as common;
 use tokio::process::Command;
 
+/*
+ * Test that the offchain-worker command works as expected.
+ * It spawns a local dev node, and then runs the offchain-worker command against it.
+ * The test covers two cases;
+ *   1. The offchain-worker command is run with a live state, and should complete successfully.
+ *   2. The offchain-worker command is run with a snap state, and should terminate with an error.
+ */
 #[tokio::test]
 async fn offchain_worker_works() {
     let port = 45789;
@@ -46,7 +53,7 @@ async fn offchain_worker_works() {
     // Wait some time to ensure that the node is warmed up.
     std::thread::sleep(Duration::from_secs(90));
 
-    // Test ok
+    // 1. Test that the command runs successfully with a live state.
     common::run_with_timeout(Duration::from_secs(60), async move {
         let ws_url = format!("ws://localhost:{}", port);
 
@@ -83,7 +90,7 @@ async fn offchain_worker_works() {
     })
     .await;
 
-    // Test attempting to use non-live state. Should terminate with error.
+    // 2. Test attempting to use non-live state. Should terminate with error.
     common::run_with_timeout(Duration::from_secs(60), async move {
         let ws_url = format!("ws://localhost:{}", port);