Orchestrator Async runtime improvements

orchestrator/gorc/src/commands/deploy/erc20.rs

@@ -5,7 +5,7 @@ use gravity_proto::gravity::{DenomToErc20ParamsRequest, DenomToErc20Request};
 use gravity_utils::connection_prep::{check_for_eth, create_rpc_connections};
 use std::convert::TryFrom;
 use std::process::exit;
-use std::time::{Duration, Instant};
+use std::time::{Duration};
 use tokio::time::sleep as delay_for;
 
 /// Deploy Erc20
@@ -85,30 +85,33 @@ impl Erc20 {
 
         println!("We have deployed ERC20 contract {:#066x}, waiting to see if the Cosmos chain choses to adopt it", res);
 
-        let start = Instant::now();
-        loop {
-            let req = DenomToErc20Request {
-                denom: denom.clone(),
-            };
-
-            let res = grpc.denom_to_erc20(req).await;
-
-            if let Ok(val) = res {
-                let val = val.into_inner();
+        match tokio::time::timeout(Duration::from_secs(100), async {
+            loop {
+                let req = DenomToErc20Request {
+                    denom: denom.clone(),
+                };
+
+                let res = grpc.denom_to_erc20(req).await;
+
+                if let Ok(val) = res {
+                    break val;
+                }
+                delay_for(Duration::from_secs(1)).await;
+            } 
+        }).await
+        {
+            Ok(val) => {
                 println!(
                     "Asset {} has accepted new ERC20 representation {}",
-                    denom, val.erc20
+                    denom,
+                    val.into_inner().erc20
                 );
                 exit(0);
-            }
-
-            if Instant::now() - start > Duration::from_secs(100) {
-                println!(
-                    "Your ERC20 contract was not adopted, double check the metadata and try again"
-                );
+            },
+            Err(_) => {
+                println!("Your ERC20 contract was not adopted, double check the metadata and try again");
                 exit(1);
-            }
-            delay_for(Duration::from_secs(1)).await;
+            },
         }
     }
 }