fix review remarks

gear-tech · Aug 5, 2024 · f741abb · f741abb
1 parent da7e2fa
commit f741abb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/relayer/src/ethereum_checkpoints/mod.rs b/relayer/src/ethereum_checkpoints/mod.rs
@@ -40,7 +40,7 @@ pub async fn relay(args: RelayCheckpointsArgs) {
         beacon_endpoint,
         vara_domain,
         vara_port,
-        suri,
+        vara_suri,
         prometheus_args: PrometheusArgs {
             endpoint: endpoint_prometheus,
         },
@@ -63,7 +63,7 @@ pub async fn relay(args: RelayCheckpointsArgs) {
 
     sync_update::spawn_receiver(client_http.clone(), beacon_endpoint.clone(), sender);
 
-    let client = GearApi::init_with(WSAddress::new(vara_domain, vara_port), suri)
+    let client = GearApi::init_with(WSAddress::new(vara_domain, vara_port), vara_suri)
         .await
         .expect("GearApi client should be created");
 

diff --git a/relayer/src/ethereum_checkpoints/sync_update.rs b/relayer/src/ethereum_checkpoints/sync_update.rs
@@ -10,23 +10,22 @@ pub fn spawn_receiver(
     tokio::spawn(async move {
         log::info!("Update receiver spawned");
 
-        let duration = Duration::from_secs(DELAY_SECS_UPDATE_REQUEST);
         let mut failures = 0;
         loop {
             match receive(&client_http, &beacon_endpoint, &sender).await {
                 Ok(Break(_)) => break,
-                Ok(Continue(_)) => time::sleep(duration).await,
+                Ok(Continue(_)) => (),
                 Err(e) => {
                     log::error!("{e:?}");
 
                     failures += 1;
                     if failures >= COUNT_FAILURE {
                         break;
                     }
-
-                    time::sleep(duration).await;
                 }
             }
+
+            time::sleep(Duration::from_secs(DELAY_SECS_UPDATE_REQUEST)).await;
         }
     });
 }
@@ -71,8 +70,6 @@ async fn receive(
         return Ok(Break(()));
     }
 
-    time::sleep(Duration::from_secs(DELAY_SECS_UPDATE_REQUEST)).await;
-
     Ok(Continue(()))
 }
 

diff --git a/relayer/src/ethereum_checkpoints/tests/mod.rs b/relayer/src/ethereum_checkpoints/tests/mod.rs
@@ -17,7 +17,7 @@ use tokio::time::{self, Duration};
 const RPC_URL: &str = "http://127.0.0.1:5052";
 const NETWORK_MAINNET: &str = "Mainnet";
 const NETWORK_HOLESKY: &str = "Holesky";
-const NETWORK_SEPOLIA: &str = "";
+const NETWORK_SEPOLIA: &str = "Sepolia";
 
 const FINALITY_UPDATE_5_254_112: &[u8; 4_940] =
     include_bytes!("./sepolia-finality-update-5_254_112.json");

diff --git a/relayer/src/main.rs b/relayer/src/main.rs
@@ -131,7 +131,7 @@ struct ProofStorageArgs {
 #[derive(Args)]
 struct RelayCheckpointsArgs {
     /// Specify ProgramId of the Checkpoint-light-client program
-    #[arg(long, env = "PROGRAM_ID")]
+    #[arg(long, env = "CHECKPOINT_LIGHT_CLIENT_ADDRESS")]
     program_id: String,
 
     /// Specify an endpoint providing Beacon API
@@ -150,8 +150,8 @@ struct RelayCheckpointsArgs {
     /// provides default users from the keyring (e.g., "//Alice", "//Bob",
     /// etc.). The password for URI should be specified in the same `suri`,
     /// separated by the ':' char
-    #[arg(long, default_value = "//Alice", env = "SURI")]
-    suri: String,
+    #[arg(long, default_value = "//Alice", env = "VARA_SURI")]
+    vara_suri: String,
 
     #[clap(flatten)]
     prometheus_args: PrometheusArgs,