clippy + test build issues

common/client-core/gateways-storage/src/types.rs

@@ -199,7 +199,7 @@ impl TryFrom<RawRemoteGatewayDetails> for RemoteGatewayDetails {
             .gateway_owner_address
             .as_ref()
             .map(|raw_owner| {
-                AccountId::from_str(&raw_owner).map_err(|source| {
+                AccountId::from_str(raw_owner).map_err(|source| {
                     BadGateway::MalformedGatewayOwnerAccountAddress {
                         gateway_id: value.gateway_id_bs58.clone(),
                         raw_owner: raw_owner.clone(),

common/client-core/src/init/types.rs

@@ -88,7 +88,7 @@ impl SelectedGateway {
             .owner
             .as_ref()
             .map(|raw_owner| {
-                AccountId::from_str(&raw_owner).map_err(|source| {
+                AccountId::from_str(raw_owner).map_err(|source| {
                     ClientCoreError::MalformedGatewayOwnerAccountAddress {
                         gateway_id: node.identity_key.to_base58_string(),
                         raw_owner: raw_owner.clone(),

common/client-libs/validator-client/src/nyxd/fee/gas_price.rs

@@ -140,6 +140,6 @@ mod tests {
 
         let fee = &gas_price * gas_limit;
         // the failing behaviour was result value of 3937
-        assert_eq!(fee.amount, 3938u64.into());
+        assert_eq!(fee.amount, 3938u128);
     }
 }

common/nymsphinx/src/receiver.rs

@@ -235,7 +235,7 @@ mod message_receiver {
             1,
             vec![mix::Node {
                 mix_id: 123,
-                owner: "foomp1".to_string(),
+                owner: None,
                 host: "10.20.30.40".parse().unwrap(),
                 mix_host: "10.20.30.40:1789".parse().unwrap(),
                 identity_key: identity::PublicKey::from_base58_string(
@@ -255,7 +255,7 @@ mod message_receiver {
             2,
             vec![mix::Node {
                 mix_id: 234,
-                owner: "foomp2".to_string(),
+                owner: None,
                 host: "11.21.31.41".parse().unwrap(),
                 mix_host: "11.21.31.41:1789".parse().unwrap(),
                 identity_key: identity::PublicKey::from_base58_string(
@@ -275,7 +275,7 @@ mod message_receiver {
             3,
             vec![mix::Node {
                 mix_id: 456,
-                owner: "foomp3".to_string(),
+                owner: None,
                 host: "12.22.32.42".parse().unwrap(),
                 mix_host: "12.22.32.42:1789".parse().unwrap(),
                 identity_key: identity::PublicKey::from_base58_string(
@@ -295,7 +295,7 @@ mod message_receiver {
             // currently coco_nodes don't really exist so this is still to be determined
             mixes,
             vec![gateway::Node {
-                owner: "foomp4".to_string(),
+                owner: None,
                 host: "1.2.3.4".parse().unwrap(),
                 mix_host: "1.2.3.4:1789".parse().unwrap(),
                 clients_ws_port: 9000,

common/topology/src/lib.rs

@@ -524,7 +524,7 @@ mod converting_mixes_to_vec {
         fn returns_a_vec_with_hashmap_values() {
             let node1 = mix::Node {
                 mix_id: 42,
-                owner: "N/A".to_string(),
+                owner: Some("N/A".to_string()),
                 host: "3.3.3.3".parse().unwrap(),
                 mix_host: "3.3.3.3:1789".parse().unwrap(),
                 identity_key: identity::PublicKey::from_base58_string(
@@ -540,12 +540,12 @@ mod converting_mixes_to_vec {
             };
 
             let node2 = mix::Node {
-                owner: "Alice".to_string(),
+                owner: Some("Alice".to_string()),
                 ..node1.clone()
             };
 
             let node3 = mix::Node {
-                owner: "Bob".to_string(),
+                owner: Some("Bob".to_string()),
                 ..node1.clone()
             };
 
@@ -555,7 +555,9 @@ mod converting_mixes_to_vec {
 
             let topology = NymTopology::new(mixes, vec![]);
             let mixvec = topology.mixes_as_vec();
-            assert!(mixvec.iter().any(|node| node.owner == "N/A"));
+            assert!(mixvec
+                .iter()
+                .any(|node| node.owner.as_ref() == Some(&"N/A".to_string())));
         }
     }
 

common/wasm/client-core/src/config/mod.rs

@@ -362,6 +362,14 @@ pub struct TopologyWasm {
     /// the first valid instance.
     /// Supersedes `topology_refresh_rate_ms`.
     pub disable_refreshing: bool,
+
+    /// Specifies a minimum performance of a mixnode that is used on route construction.
+    /// This setting is only applicable when `NymApi` topology is used.
+    pub minimum_mixnode_performance: u8,
+
+    /// Specifies a minimum performance of a gateway that is used on route construction.
+    /// This setting is only applicable when `NymApi` topology is used.
+    pub minimum_gateway_performance: u8,
 }
 
 impl Default for TopologyWasm {
@@ -382,6 +390,8 @@ impl From<TopologyWasm> for ConfigTopology {
                 topology.max_startup_gateway_waiting_period_ms as u64,
             ),
             topology_structure: Default::default(),
+            minimum_mixnode_performance: topology.minimum_mixnode_performance,
+            minimum_gateway_performance: topology.minimum_gateway_performance,
         }
     }
 }
@@ -395,6 +405,8 @@ impl From<ConfigTopology> for TopologyWasm {
                 .max_startup_gateway_waiting_period
                 .as_millis() as u32,
             disable_refreshing: topology.disable_refreshing,
+            minimum_mixnode_performance: topology.minimum_mixnode_performance,
+            minimum_gateway_performance: topology.minimum_gateway_performance,
         }
     }
 }

sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs

@@ -55,7 +55,7 @@ async fn main() {
         3,
         vec![mix::Node {
             mix_id: 66,
-            owner: "n1ae2pjd7q9p0dea65pqkvcm4x9s264v4fktpyru".to_string(),
+            owner: None,
             host: "139.162.247.97".parse().unwrap(),
             mix_host: "139.162.247.97:1789".parse().unwrap(),
             identity_key: "66UngapebhJRni3Nj52EW1qcNsWYiuonjkWJzHFsmyYY"