Refactor the "ReplicatedData" struct

Rename the "ReplicatedData" struct to the "NodeInfo" struct.
Also refactors and renames the members in this struct.

src/bin/client-demo.rs

@@ -8,7 +8,7 @@ extern crate solana;
 use bincode::serialize;
 use clap::{App, Arg};
 use rayon::prelude::*;
-use solana::crdt::{Crdt, ReplicatedData};
+use solana::crdt::{Crdt, NodeInfo};
 use solana::drone::DroneRequest;
 use solana::fullnode::Config;
 use solana::hash::Hash;
@@ -38,7 +38,7 @@ fn sample_tx_count(
     exit: Arc<AtomicBool>,
     maxes: Arc<RwLock<Vec<(f64, u64)>>>,
     first_count: u64,
-    v: ReplicatedData,
+    v: NodeInfo,
     sample_period: u64,
 ) {
     let mut client = mk_client(&v);
@@ -79,7 +79,7 @@ fn generate_and_send_txs(
     tx_clients: &Vec<ThinClient>,
     id: &Mint,
     keypairs: &Vec<KeyPair>,
-    leader: &ReplicatedData,
+    leader: &NodeInfo,
     txs: i64,
     last_id: &mut Hash,
     threads: usize,
@@ -185,12 +185,12 @@ fn main() {
         )
         .get_matches();
 
-    let leader: ReplicatedData;
+    let leader: NodeInfo;
     if let Some(l) = matches.value_of("leader") {
         leader = read_leader(l.to_string()).node_info;
     } else {
         let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
-        leader = ReplicatedData::new_leader(&server_addr);
+        leader = NodeInfo::new_leader(&server_addr);
     };
 
     let id: Mint;
@@ -319,7 +319,7 @@ fn main() {
     }
 }
 
-fn mk_client(r: &ReplicatedData) -> ThinClient {
+fn mk_client(r: &NodeInfo) -> ThinClient {
     let requests_socket = udp_random_bind(8000, 10000, 5).unwrap();
     let transactions_socket = udp_random_bind(8000, 10000, 5).unwrap();
 
@@ -335,11 +335,11 @@ fn mk_client(r: &ReplicatedData) -> ThinClient {
     )
 }
 
-fn spy_node() -> (ReplicatedData, UdpSocket) {
+fn spy_node() -> (NodeInfo, UdpSocket) {
     let gossip_socket_pair = udp_public_bind("gossip", 8000, 10000);
     let pubkey = KeyPair::new().pubkey();
     let daddr = "0.0.0.0:0".parse().unwrap();
-    let node = ReplicatedData::new(
+    let node = NodeInfo::new(
         pubkey,
         //gossip.local_addr().unwrap(),
         gossip_socket_pair.addr,
@@ -352,11 +352,11 @@ fn spy_node() -> (ReplicatedData, UdpSocket) {
 }
 
 fn converge(
-    leader: &ReplicatedData,
+    leader: &NodeInfo,
     exit: Arc<AtomicBool>,
     num_nodes: usize,
     threads: &mut Vec<JoinHandle<()>>,
-) -> Vec<ReplicatedData> {
+) -> Vec<NodeInfo> {
     //lets spy on the network
     let daddr = "0.0.0.0:0".parse().unwrap();
     let (spy, spy_gossip) = spy_node();
@@ -376,7 +376,7 @@ fn converge(
     let mut rv = vec![];
     //wait for the network to converge, 30 seconds should be plenty
     for _ in 0..30 {
-        let v: Vec<ReplicatedData> = spy_ref
+        let v: Vec<NodeInfo> = spy_ref
             .read()
             .unwrap()
             .table

src/bin/drone.rs

@@ -9,7 +9,7 @@ extern crate tokio_io;
 
 use bincode::deserialize;
 use clap::{App, Arg};
-use solana::crdt::ReplicatedData;
+use solana::crdt::NodeInfo;
 use solana::drone::{Drone, DroneRequest};
 use solana::fullnode::Config;
 use solana::mint::Mint;
@@ -60,12 +60,12 @@ fn main() {
         )
         .get_matches();
 
-    let leader: ReplicatedData;
+    let leader: NodeInfo;
     if let Some(l) = matches.value_of("leader") {
         leader = read_leader(l.to_string()).node_info;
     } else {
         let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
-        leader = ReplicatedData::new_leader(&server_addr);
+        leader = NodeInfo::new_leader(&server_addr);
     };
 
     let mint: Mint;

src/bin/fullnode.rs

@@ -8,7 +8,7 @@ extern crate solana;
 
 use atty::{is, Stream};
 use clap::{App, Arg};
-use solana::crdt::{ReplicatedData, TestNode};
+use solana::crdt::{NodeInfo, TestNode};
 use solana::fullnode::{Config, FullNode, InFile, OutFile};
 use solana::service::Service;
 use solana::signature::{KeyPair, KeyPairUtil};
@@ -52,7 +52,7 @@ fn main() -> () {
 
     let bind_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
     let mut keypair = KeyPair::new();
-    let mut repl_data = ReplicatedData::new_leader_with_pubkey(keypair.pubkey(), &bind_addr);
+    let mut repl_data = NodeInfo::new_leader_with_pubkey(keypair.pubkey(), &bind_addr);
     if let Some(l) = matches.value_of("identity") {
         let path = l.to_string();
         if let Ok(file) = File::open(path.clone()) {
@@ -82,7 +82,7 @@ fn main() -> () {
             None,
         )
     } else {
-        node.data.current_leader_id = node.data.id.clone();
+        node.data.leader_id = node.data.id.clone();
 
         let outfile = if let Some(o) = matches.value_of("output") {
             OutFile::Path(o.to_string())

src/bin/wallet.rs

@@ -8,7 +8,7 @@ extern crate solana;
 
 use bincode::serialize;
 use clap::{App, Arg, SubCommand};
-use solana::crdt::ReplicatedData;
+use solana::crdt::NodeInfo;
 use solana::drone::DroneRequest;
 use solana::fullnode::Config;
 use solana::mint::Mint;
@@ -56,7 +56,7 @@ impl error::Error for WalletError {
 }
 
 struct WalletConfig {
-    leader: ReplicatedData,
+    leader: NodeInfo,
     id: Mint,
     drone_addr: SocketAddr,
     command: WalletCommand,
@@ -66,7 +66,7 @@ impl Default for WalletConfig {
     fn default() -> WalletConfig {
         let default_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
         WalletConfig {
-            leader: ReplicatedData::new_leader(&default_addr.clone()),
+            leader: NodeInfo::new_leader(&default_addr.clone()),
             id: Mint::new(0),
             drone_addr: default_addr.clone(),
             command: WalletCommand::Balance,
@@ -141,12 +141,12 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
         .subcommand(SubCommand::with_name("address").about("Get your public key"))
         .get_matches();
 
-    let leader: ReplicatedData;
+    let leader: NodeInfo;
     if let Some(l) = matches.value_of("leader") {
         leader = read_leader(l.to_string()).node_info;
     } else {
         let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
-        leader = ReplicatedData::new_leader(&server_addr);
+        leader = NodeInfo::new_leader(&server_addr);
     };
 
     let id: Mint;
@@ -298,7 +298,7 @@ fn read_mint(path: String) -> Result<Mint, Box<error::Error>> {
     Ok(mint)
 }
 
-fn mk_client(r: &ReplicatedData) -> io::Result<ThinClient> {
+fn mk_client(r: &NodeInfo) -> io::Result<ThinClient> {
     let requests_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
     let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
     requests_socket

src/choose_gossip_peer_strategy.rs

@@ -1,4 +1,4 @@
-use crdt::{CrdtError, ReplicatedData};
+use crdt::{CrdtError, NodeInfo};
 use rand::distributions::{Distribution, Weighted, WeightedChoice};
 use rand::thread_rng;
 use result::Result;
@@ -9,7 +9,7 @@ use std::collections::HashMap;
 pub const DEFAULT_WEIGHT: u32 = 1;
 
 pub trait ChooseGossipPeerStrategy {
-    fn choose_peer<'a>(&self, options: Vec<&'a ReplicatedData>) -> Result<&'a ReplicatedData>;
+    fn choose_peer<'a>(&self, options: Vec<&'a NodeInfo>) -> Result<&'a NodeInfo>;
 }
 
 pub struct ChooseRandomPeerStrategy<'a> {
@@ -27,7 +27,7 @@ impl<'a, 'b> ChooseRandomPeerStrategy<'a> {
 }
 
 impl<'a> ChooseGossipPeerStrategy for ChooseRandomPeerStrategy<'a> {
-    fn choose_peer<'b>(&self, options: Vec<&'b ReplicatedData>) -> Result<&'b ReplicatedData> {
+    fn choose_peer<'b>(&self, options: Vec<&'b NodeInfo>) -> Result<&'b NodeInfo> {
         if options.is_empty() {
             Err(CrdtError::TooSmall)?;
         }
@@ -172,7 +172,7 @@ impl<'a> ChooseWeightedPeerStrategy<'a> {
 }
 
 impl<'a> ChooseGossipPeerStrategy for ChooseWeightedPeerStrategy<'a> {
-    fn choose_peer<'b>(&self, options: Vec<&'b ReplicatedData>) -> Result<&'b ReplicatedData> {
+    fn choose_peer<'b>(&self, options: Vec<&'b NodeInfo>) -> Result<&'b NodeInfo> {
         if options.len() < 1 {
             Err(CrdtError::TooSmall)?;
         }