refactor get_transaction_status util

Layr-Labs · Sep 27, 2024 · fab550c · fab550c
1 parent cddff16
commit fab550c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/chainio/clients/elcontracts/src/writer.rs b/crates/chainio/clients/elcontracts/src/writer.rs
@@ -330,9 +330,7 @@ mod tests {
             .register_as_operator(operator)
             .await
             .unwrap();
-        wait_transaction(http_endpoint.clone(), tx_hash)
-            .await
-            .unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         let receipt = provider.get_transaction_receipt(tx_hash).await.unwrap();
         assert!(receipt.unwrap().status());
@@ -355,9 +353,7 @@ mod tests {
             .update_operator_details(operator_modified)
             .await
             .unwrap();
-        wait_transaction(http_endpoint.clone(), tx_hash)
-            .await
-            .unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         let receipt = provider.get_transaction_receipt(tx_hash).await.unwrap();
         assert!(receipt.unwrap().status());
@@ -369,7 +365,7 @@ mod tests {
             .deposit_erc20_into_strategy(strategy_addr, amount)
             .await
             .unwrap();
-        wait_transaction(http_endpoint, tx_hash).await.unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         let receipt = provider.get_transaction_receipt(tx_hash).await.unwrap();
         assert!(receipt.unwrap().status());

diff --git a/crates/services/bls_aggregation/src/bls_agg_test.rs b/crates/services/bls_aggregation/src/bls_agg_test.rs
@@ -175,7 +175,7 @@ pub mod integration_test {
             )
             .await
             .unwrap();
-        wait_transaction(http_endpoint, tx_hash).await.unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         // Create aggregation service
         let avs_registry_service =
@@ -348,7 +348,7 @@ pub mod integration_test {
             )
             .await
             .unwrap();
-        wait_transaction(http_endpoint, tx_hash).await.unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         // Create aggregation service
         let avs_registry_service =
@@ -528,9 +528,7 @@ pub mod integration_test {
             )
             .await
             .unwrap();
-        wait_transaction(http_endpoint.clone(), tx_hash)
-            .await
-            .unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         let avs_writer = AvsRegistryChainWriter::build_avs_registry_chain_writer(
             // TODO: check if needed
@@ -553,7 +551,7 @@ pub mod integration_test {
             )
             .await
             .unwrap();
-        wait_transaction(http_endpoint, tx_hash).await.unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
 
         // Create aggregation service
         let avs_registry_service =

diff --git a/crates/services/operatorsinfo/src/operatorsinfo_inmemory.rs b/crates/services/operatorsinfo/src/operatorsinfo_inmemory.rs
@@ -535,6 +535,6 @@ mod tests {
             )
             .await
             .unwrap();
-        wait_transaction(http_endpoint, tx_hash).await.unwrap();
+        wait_transaction(&http_endpoint, tx_hash).await.unwrap();
     }
 }
diff --git a/testing/testing-utils/Cargo.toml b/testing/testing-utils/Cargo.toml
@@ -21,6 +21,5 @@ eigen-utils.workspace = true
 once_cell.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tokio.workspace = true
 testcontainers.workspace = true
 url.workspace = true
diff --git a/testing/testing-utils/src/transaction.rs b/testing/testing-utils/src/transaction.rs
@@ -2,7 +2,6 @@ use alloy_primitives::{FixedBytes, TxHash};
 use alloy_provider::{PendingTransactionBuilder, Provider, ProviderBuilder};
 use alloy_transport::{TransportErrorKind, TransportResult};
 use eigen_utils::get_provider;
-use tokio::time::{sleep, Duration};
 use url::Url;
 
 /// Retrieves the status of a transaction from its hash.
@@ -16,10 +15,11 @@ use url::Url;
 ///
 /// A bool indicating wether the transaction was successful or not.
 pub async fn get_transaction_status(rpc_url: String, tx_hash: FixedBytes<32>) -> bool {
-    // this sleep is needed so that we wait for the tx to be processed
-    sleep(Duration::from_millis(500)).await;
+    if wait_transaction(&rpc_url, tx_hash).await.is_err() {
+        return false;
+    }
+
     get_provider(&rpc_url)
-        .clone()
         .get_transaction_receipt(tx_hash)
         .await
         .unwrap_or(None)
@@ -37,9 +37,8 @@ pub async fn get_transaction_status(rpc_url: String, tx_hash: FixedBytes<32>) ->
 /// # Returns
 ///
 /// A [`TransportResult`] containing the transaction hash.
-pub async fn wait_transaction(rpc_url: String, tx_hash: FixedBytes<32>) -> TransportResult<TxHash> {
-    let url =
-        Url::parse(&rpc_url).map_err(|_| TransportErrorKind::custom_str("Invalid RPC URL"))?;
+pub async fn wait_transaction(rpc_url: &str, tx_hash: FixedBytes<32>) -> TransportResult<TxHash> {
+    let url = Url::parse(rpc_url).map_err(|_| TransportErrorKind::custom_str("Invalid RPC URL"))?;
     let root_provider = ProviderBuilder::new().on_http(url);
     let pending_tx = PendingTransactionBuilder::new(&root_provider, tx_hash);
     pending_tx.watch().await