Construct test routes from good nodes only

validator-api/src/network_monitor/monitor/preparer.rs

@@ -229,7 +229,7 @@ impl PacketPreparer {
     }
 
     async fn all_mixnodes_and_gateways(&self) -> (Vec<MixNodeBond>, Vec<GatewayBond>) {
-        info!(target: "Monitor", "Obtaining network topology...");
+        info!(target: "Monitor", "Obtaining entire network topology...");
 
         let mixnodes = self.validator_cache.mixnodes_all().await;
         let gateways = self.validator_cache.gateways_all().await;
@@ -237,6 +237,15 @@ impl PacketPreparer {
         (mixnodes, gateways)
     }
 
+    async fn mixnodes_and_gateways(&self) -> (Vec<MixNodeBond>, Vec<GatewayBond>) {
+        info!(target: "Monitor", "Obtaining good network topology...");
+
+        let mixnodes = self.validator_cache.mixnodes().await;
+        let gateways = self.validator_cache.gateways().await;
+
+        (mixnodes, gateways)
+    }
+
     pub(crate) fn try_parse_mix_bond(&self, mix: &MixNodeBond) -> Result<mix::Node, String> {
         let identity = mix.mix_node.identity_key.clone();
         if !self.check_version_compatibility(&mix.mix_node.version) {
@@ -266,7 +275,7 @@ impl PacketPreparer {
         n: usize,
         blacklist: &mut HashSet<String>,
     ) -> Option<Vec<TestRoute>> {
-        let (mixnodes, gateways) = self.all_mixnodes_and_gateways().await;
+        let (mixnodes, gateways) = self.mixnodes_and_gateways().await;
         // separate mixes into layers for easier selection
         let mut layered_mixes = HashMap::new();
         for mix in mixnodes {