renamed to contact_info

This commit is contained in:
Anatoly Yakovenko
2018-07-09 17:55:11 -07:00
committed by Greg Fitzgerald
parent 97dd1834d7
commit 63985d4595
10 changed files with 95 additions and 95 deletions

View File

@ -29,8 +29,8 @@ fn converge(leader: &ReplicatedData, num_nodes: usize) -> Vec<ReplicatedData> {
let mut spy = TestNode::new();
let daddr = "0.0.0.0:0".parse().unwrap();
let me = spy.data.id.clone();
spy.data.addrs.replicate = daddr;
spy.data.addrs.requests = daddr;
spy.data.contact_info.tvu = daddr;
spy.data.contact_info.rpu = daddr;
let mut spy_crdt = Crdt::new(spy.data);
spy_crdt.insert(&leader);
spy_crdt.set_leader(leader.id);
@ -55,7 +55,7 @@ fn converge(leader: &ReplicatedData, num_nodes: usize) -> Vec<ReplicatedData> {
.values()
.into_iter()
.filter(|x| x.id != me)
.filter(|x| x.addrs.requests != daddr)
.filter(|x| x.contact_info.rpu != daddr)
.cloned()
.collect();
if num >= num_nodes as u64 && v.len() >= num_nodes {
@ -110,7 +110,7 @@ fn test_multi_node_validator_catchup_from_zero() {
validator,
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
None,
exit.clone(),
);
@ -143,7 +143,7 @@ fn test_multi_node_validator_catchup_from_zero() {
TestNode::new(),
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
None,
exit.clone(),
);
@ -211,7 +211,7 @@ fn test_multi_node_basic() {
validator,
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
None,
exit.clone(),
);
@ -272,7 +272,7 @@ fn test_boot_validator_from_file() {
validator,
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
None,
exit.clone(),
);
@ -356,7 +356,7 @@ fn test_leader_restart_validator_start_from_old_ledger() {
validator,
false,
InFile::Path(stale_ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
None,
exit.clone(),
);
@ -425,7 +425,7 @@ fn test_multi_node_dynamic_network() {
validator,
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
Some(OutFile::Path(ledger_path.clone())),
exit.clone(),
);
@ -482,7 +482,7 @@ fn test_multi_node_dynamic_network() {
validator,
false,
InFile::Path(ledger_path.clone()),
Some(leader_data.addrs.gossip),
Some(leader_data.contact_info.ncp),
Some(OutFile::Path(ledger_path.clone())),
exit.clone(),
);
@ -518,12 +518,12 @@ fn mk_client(leader: &ReplicatedData) -> ThinClient {
.unwrap();
let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let daddr = "0.0.0.0:0".parse().unwrap();
assert!(leader.addrs.requests != daddr);
assert!(leader.addrs.transactions != daddr);
assert!(leader.contact_info.rpu != daddr);
assert!(leader.contact_info.tpu != daddr);
ThinClient::new(
leader.addrs.requests,
leader.contact_info.rpu,
requests_socket,
leader.addrs.transactions,
leader.contact_info.tpu,
transactions_socket,
)
}