refactor(ethexe): Subscribe blocks when Observer is created (#4311)

Co-authored-by: StackOverflowExcept1on <109800286+StackOverflowExcept1on@users.noreply.github.com>
gear-tech · Dec 10, 2024 · ed59317 · ed59317
1 parent a967e29
commit ed59317
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 193 deletions.
diff --git a/ethexe/cli/src/service.rs b/ethexe/cli/src/service.rs
@@ -432,6 +432,13 @@ impl Service {
         }
     }
 
+    pub async fn run(self) -> Result<()> {
+        self.run_inner().await.map_err(|err| {
+            log::error!("Service finished work with error: {err:?}");
+            err
+        })
+    }
+
     async fn run_inner(self) -> Result<()> {
         let Service {
             db,
@@ -591,13 +598,6 @@ impl Service {
         Ok(())
     }
 
-    pub async fn run(self) -> Result<()> {
-        self.run_inner().await.map_err(|err| {
-            log::error!("Service finished work with error: {:?}", err);
-            err
-        })
-    }
-
     async fn post_process_commitments(
         code_commitments: Vec<CodeCommitment>,
         block_commitments: Vec<BlockCommitment>,

diff --git a/ethexe/cli/src/tests.rs b/ethexe/cli/src/tests.rs
@@ -501,10 +501,6 @@ async fn ping_reorg() {
     assert_eq!(res.program_id, ping_id);
     assert_eq!(res.reply_payload, b"PONG");
 
-    // Await for service block with user reply handling
-    // TODO: this is for better logs reading only, should find a better solution #4099
-    tokio::time::sleep(env.block_time).await;
-
     log::info!("📗 Test after reverting to the program creation snapshot");
     provider
         .anvil_revert(program_created_snapshot_id)
@@ -546,10 +542,6 @@ async fn ping_reorg() {
     let res = send_message.wait_for().await.unwrap();
     assert_eq!(res.program_id, ping_id);
     assert_eq!(res.reply_payload, b"PONG");
-
-    // Await for service block with user reply handling
-    // TODO: this is for better logs reading only, should find a better solution #4099
-    tokio::time::sleep(Duration::from_secs(1)).await;
 }
 
 // Mine 150 blocks - send message - mine 150 blocks.
@@ -1354,7 +1346,6 @@ mod utils {
                 None,
                 None,
             );
-
             let handle = task::spawn(service.run());
             self.running_service_handle = Some(handle);
 

diff --git a/ethexe/ethereum/src/lib.rs b/ethexe/ethereum/src/lib.rs
@@ -300,7 +300,9 @@ impl<T: Transport + Clone, N: Network> TryGetReceipt<T, N> for PendingTransactio
             Err(err) => err,
         };
 
-        for _ in 0..3 {
+        log::trace!("Failed to get transaction receipt for {tx_hash}. Retrying...");
+        for n in 0..3 {
+            log::trace!("Attempt {n}. Error - {err}");
             match err {
                 PendingTransactionError::TransportError(RpcError::NullResp) => {}
                 _ => break,