rebased

src/cluster_info.rs

@@ -273,7 +273,7 @@ impl ClusterInfo {
         );
         trace!("broadcast orders table {}", orders.len());
 
-        let errs = Self::send_orders(s, orders, me);
+        let errs = Self::send_orders(s, orders, me, leader_id);
 
         for e in errs {
             if let Err(e) = &e {
@@ -336,18 +336,19 @@ impl ClusterInfo {
         s: &UdpSocket,
         orders: Vec<(Option<SharedBlob>, Vec<&NodeInfo>)>,
         me: &NodeInfo,
+        leader_id: Pubkey,
     ) -> Vec<io::Result<usize>> {
         orders
             .into_iter()
             .flat_map(|(b, vs)| {
                 // only leader should be broadcasting
-                assert!(vs.iter().find(|info| info.id == me.leader_id).is_none());
+                assert!(vs.iter().find(|info| info.id == leader_id).is_none());
                 let bl = b.unwrap();
                 let blob = bl.read().unwrap();
                 //TODO profile this, may need multiple sockets for par_iter
                 let ids_and_tvus = if log_enabled!(Level::Trace) {
                     let v_ids = vs.iter().map(|v| v.id);
-                    let tvus = vs.iter().map(|v| v.contact_info.tvu);
+                    let tvus = vs.iter().map(|v| v.tvu);
                     let ids_and_tvus = v_ids.zip(tvus).collect();
 
                     trace!(
@@ -368,7 +369,7 @@ impl ClusterInfo {
                 let send_errs_for_blob: Vec<_> = vs
                     .iter()
                     .map(move |v| {
-                        let e = s.send_to(&blob.data[..blob.meta.size], &v.contact_info.tvu);
+                        let e = s.send_to(&blob.data[..blob.meta.size], &v.tvu);
                         trace!(
                             "{}: done broadcast {} to {:?}",
                             me.id,

tests/multinode.rs

@@ -68,7 +68,7 @@ fn make_listening_node(leader: &NodeInfo) -> (Ncp, Arc<RwLock<ClusterInfo>>, Nod
     let new_node_info = new_node.info.clone();
     let me = new_node.info.id.clone();
     let mut new_node_cluster_info = ClusterInfo::new(new_node_info).expect("ClusterInfo::new");
-    new_node_cluster_info.insert(&leader);
+    new_node_cluster_info.insert_info(leader.clone());
     new_node_cluster_info.set_leader(leader.id);
     let new_node_cluster_info_ref = Arc::new(RwLock::new(new_node_cluster_info));
     let new_node_window = Arc::new(RwLock::new(default_window()));
@@ -1559,7 +1559,7 @@ fn test_broadcast_last_tick() {
         &bootstrap_leader_ledger_path,
         Arc::new(bootstrap_leader_keypair),
         Arc::new(Keypair::new()),
-        Some(bootstrap_leader_info.contact_info.ncp),
+        Some(bootstrap_leader_info.ncp),
         false,
         LeaderScheduler::new(&leader_scheduler_config),
         None,