post rebase fixes + clippy

I know, I should have probably included them properly during rebasing ¯\_(ツ)_/¯
nymtech · Feb 21, 2023 · 3bb0500 · 3bb0500
1 parent a84ee48
commit 3bb0500
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/client-core/src/error.rs b/clients/client-core/src/error.rs
@@ -3,8 +3,8 @@
 
 use gateway_client::error::GatewayClientError;
 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
+use nym_topology::gateway::GatewayConversionError;
 use nym_topology::NymTopologyError;
-use topology::gateway::GatewayConversionError;
 use validator_client::ValidatorClientError;
 
 #[derive(thiserror::Error, Debug)]

diff --git a/clients/client-core/src/init/helpers.rs b/clients/client-core/src/init/helpers.rs
@@ -16,7 +16,6 @@ use nym_topology::{filter::VersionFilterable, gateway};
 use rand::{seq::SliceRandom, thread_rng, Rng};
 use std::{sync::Arc, time::Duration};
 use tap::TapFallible;
-use topology::{filter::VersionFilterable, gateway};
 use tungstenite::Message;
 use url::Url;
 
@@ -139,11 +138,7 @@ async fn measure_latency(gateway: gateway::Node) -> Result<GatewayWithLatency, C
             _ = &mut timeout => {
                 warn!("timed out while trying to perform measurement...")
             }
-            res = measurement_future => {
-                if let Err(err) = res {
-                    return Err(err)
-                }
-            }
+            res = measurement_future => res?,
         }
     }