This commit is contained in:
Anatoly Yakovenko
2018-05-23 10:52:47 -07:00
committed by Greg Fitzgerald
parent 60da7f7aaf
commit 239b925fb3
3 changed files with 6 additions and 7 deletions

View File

@ -723,8 +723,8 @@ mod test {
serve.local_addr().unwrap(), serve.local_addr().unwrap(),
event.local_addr().unwrap(), event.local_addr().unwrap(),
); );
let crdt = Crdt::new(d);
trace!("data: {:?}", d); trace!("data: {:?}", d);
let crdt = Crdt::new(d);
(Arc::new(RwLock::new(crdt)), gossip, replicate, serve) (Arc::new(RwLock::new(crdt)), gossip, replicate, serve)
} }

View File

@ -208,7 +208,7 @@ mod tests {
bank, bank,
alice.last_id(), alice.last_id(),
Some(Duration::from_millis(30)), Some(Duration::from_millis(30)),
leader.data, leader.data.clone(),
leader.requests, leader.requests,
leader.event, leader.event,
leader.broadcast, leader.broadcast,
@ -243,13 +243,12 @@ mod tests {
let bank = Bank::new(&alice); let bank = Bank::new(&alice);
let bob_pubkey = KeyPair::new().pubkey(); let bob_pubkey = KeyPair::new().pubkey();
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let events_addr = leader.data.events_addr;
let server = Server::leader( let server = Server::leader(
bank, bank,
alice.last_id(), alice.last_id(),
Some(Duration::from_millis(30)), Some(Duration::from_millis(30)),
leader.data, leader.data.clone(),
leader.requests, leader.requests,
leader.event, leader.event,
leader.broadcast, leader.broadcast,
@ -265,7 +264,7 @@ mod tests {
.set_read_timeout(Some(Duration::new(5, 0))) .set_read_timeout(Some(Duration::new(5, 0)))
.unwrap(); .unwrap();
let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut client = ThinClient::new(leader.data.requests_addr, requests_socket, events_addr, events_socket); let mut client = ThinClient::new(leader.data.requests_addr, requests_socket, leader.data.events_addr, events_socket);
let last_id = client.get_last_id().wait().unwrap(); let last_id = client.get_last_id().wait().unwrap();
let tr = Transaction::new(&alice.keypair(), bob_pubkey, 500, last_id); let tr = Transaction::new(&alice.keypair(), bob_pubkey, 500, last_id);
@ -368,7 +367,7 @@ mod tests {
leader_bank, leader_bank,
alice.last_id(), alice.last_id(),
None, None,
leader.data, leader.data.clone(),
leader.requests, leader.requests,
leader.event, leader.event,
leader.broadcast, leader.broadcast,

View File

@ -226,7 +226,7 @@ pub mod tests {
let replicate_addr = target1.data.replicate_addr; let replicate_addr = target1.data.replicate_addr;
let bank = Arc::new(Bank::new(&mint)); let bank = Arc::new(Bank::new(&mint));
let tvu = Tvu::new( let tvu = Tvu::new(
bank, bank.clone(),
target1.data, target1.data,
target1.gossip, target1.gossip,
target1.replicate, target1.replicate,