map: changed node info/id to list across project

bin/map/src/app.rs

@@ -10,8 +10,8 @@ use crate::{
 // arc reference
 #[derive(Clone)]
 pub struct App {
-    pub node_list: IdList,
-    pub node_info: InfoList,
+    pub id_list: IdList,
+    pub info_list: InfoList,
 }
 
 impl App {
@@ -49,7 +49,7 @@ impl App {
             },
         ];
 
-        let node_info = InfoList::new(infos.clone());
+        let info_list = InfoList::new(infos.clone());
 
         let ids = vec![
             infos[0].id.clone(),
@@ -59,14 +59,14 @@ impl App {
             infos[4].id.clone(),
         ];
 
-        let node_list = IdList::new(ids);
+        let id_list = IdList::new(ids);
 
         //let infos = Vec::new();
         //let ids = Vec::new();
 
-        //let node_info = InfoList::new(infos);
-        //let node_list = IdList::new(ids);
-        App { node_list, node_info }
+        //let info_list = InfoList::new(infos);
+        //let id_list = IdList::new(ids);
+        App { id_list, info_list }
     }
 
     // TODO: implement this
@@ -78,17 +78,17 @@ impl App {
         let ids = vec![node_vec[0].id.clone()];
 
         for id in ids {
-            self.node_list.node_id.push(id);
+            self.id_list.node_id.push(id);
         }
 
-        let node_list = self.node_list;
+        let id_list = self.id_list;
 
         for info in node_vec {
-            self.node_info.infos.push(info);
+            self.info_list.infos.push(info);
         }
-        let node_info = self.node_info;
+        let info_list = self.info_list;
 
-        App { node_list, node_info }
+        App { id_list, info_list }
     }
 }
 

bin/map/src/main.rs

@@ -144,9 +144,9 @@ async fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Re
 
     terminal.clear()?;
 
-    app.node_list.state.select(Some(0));
+    app.id_list.state.select(Some(0));
 
-    app.node_info.index = 0;
+    app.info_list.index = 0;
 
     // acquire the mutex
     // let mut app = app.lock();
@@ -161,12 +161,12 @@ async fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Re
                     return Ok(())
                 }
                 Key::Char('j') => {
-                    app.node_list.next();
-                    app.node_info.next();
+                    app.id_list.next();
+                    app.info_list.next();
                 }
                 Key::Char('k') => {
-                    app.node_list.previous();
-                    app.node_info.previous();
+                    app.id_list.previous();
+                    app.info_list.previous();
                 }
                 _ => (),
             }

bin/map/src/ui.rs

@@ -16,7 +16,7 @@ pub fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
         .split(f.size());
 
     let nodes: Vec<ListItem> = app
-        .node_list
+        .id_list
         .node_id
         .iter()
         .map(|id| {
@@ -29,18 +29,18 @@ pub fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
         .block(Block::default().borders(Borders::ALL))
         .highlight_style(Style::default().fg(Color::LightCyan).add_modifier(Modifier::BOLD));
 
-    f.render_stateful_widget(nodes, slice[0], &mut app.node_list.state);
+    f.render_stateful_widget(nodes, slice[0], &mut app.id_list.state);
 
-    let index = app.node_info.index;
+    let index = app.info_list.index;
 
     render_info(app, f, index, slice);
 }
 
 fn render_info<B: Backend>(app: &mut App, f: &mut Frame<B>, index: usize, slice: Vec<Rect>) {
-    let id = &app.node_info.infos[index].id;
-    let connections = app.node_info.infos[index].connections;
-    let is_active = app.node_info.infos[index].is_active;
-    let message = &app.node_info.infos[index].last_message;
+    let id = &app.info_list.infos[index].id;
+    let connections = app.info_list.infos[index].connections;
+    let is_active = app.info_list.infos[index].is_active;
+    let message = &app.info_list.infos[index].last_message;
     let span = vec![
         Spans::from(format!("NodeId: {}", id)),
         Spans::from(format!("Number of connections: {}", connections)),