Merge pull request #513 from hashgraph/sr/random-nodes-better

Author: mehcode

Cargo.lock

@@ -402,7 +402,13 @@ impl NetworkData {
     }
 
     pub(crate) fn random_node_ids(&self) -> Vec<AccountId> {
-        let node_ids: Vec<_> = self.healthy_node_ids().collect();
+        let mut node_ids: Vec<_> = self.healthy_node_ids().collect();
+
+        if node_ids.is_empty() {
+            log::warn!("No healthy nodes, randomly picking some unhealthy ones");
+            // hack, slowpath, don't care perf, fix this better later tho.
+            node_ids = self.node_ids.to_vec();
+        }
 
         let node_sample_amount = (node_ids.len() + 2) / 3;
 

src/client/network/mod.rs

@@ -221,7 +221,14 @@ impl<D> Transaction<D> {
     /// Defaults to the full list of nodes configured on the client.
     #[track_caller]
     pub fn node_account_ids(&mut self, ids: impl IntoIterator<Item = AccountId>) -> &mut Self {
-        self.body_mut().node_account_ids = Some(ids.into_iter().collect());
+        let nodes: Vec<_> = ids.into_iter().collect();
+
+        if nodes.is_empty() {
+            log::warn!("Nodes list is empty, ignoring setter");
+        } else {
+            self.body_mut().node_account_ids = Some(nodes);
+        }
+
         self
     }
 
@@ -388,9 +395,20 @@ impl<D: ValidateChecksums> Transaction<D> {
 
         let node_account_ids = match &self.body.node_account_ids {
             // the clone here is the lesser of two evils.
-            Some(it) => it.clone(),
+            Some(it) => {
+                assert!(!it.is_empty());
+                it.clone()
+            }
             None => {
-                client.ok_or(Error::FreezeUnsetNodeAccountIds)?.net().0.load().random_node_ids()
+                let nodes = client
+                    .ok_or(Error::FreezeUnsetNodeAccountIds)?
+                    .net()
+                    .0
+                    .load()
+                    .random_node_ids();
+                assert!(!nodes.is_empty(), "BUG: Client didn't give any nodes (all unhealthy)");
+
+                nodes
             }
         };