blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct some strange naming

This commit is contained in:
Greg Fitzgerald 2018-05-11 16:15:14 -06:00
parent bcdb058492
commit 95bf68f3f5
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/client-demo.rs
View File

@ -87,10 +87,10 @@ fn main() {
println!("Binding to {}", client_addr);
let socket = UdpSocket::bind(&client_addr).unwrap();
socket.set_read_timeout(Some(Duration::new(5, 0))).unwrap();
let mut accountant = ThinClient::new(addr.parse().unwrap(), socket);
let mut client = ThinClient::new(addr.parse().unwrap(), socket);
println!("Get last ID...");
let last_id = accountant.get_last_id().wait().unwrap();
let last_id = client.get_last_id().wait().unwrap();
println!("Got last ID {:?}", last_id);
let rnd = GenKeys::new(demo.mint.keypair().public_key_bytes());
@ -122,7 +122,7 @@ fn main() {
nsps / 1_000_f64
);
let initial_tx_count = accountant.transaction_count();
let initial_tx_count = client.transaction_count();
println!("initial count {}", initial_tx_count);
println!("Transfering {} transactions in {} batches", txs, threads);
@ -134,16 +134,16 @@ fn main() {
let mut client_addr: SocketAddr = client_addr.parse().unwrap();
client_addr.set_port(0);
let socket = UdpSocket::bind(client_addr).unwrap();
let accountant = ThinClient::new(addr.parse().unwrap(), socket);
let client = ThinClient::new(addr.parse().unwrap(), socket);
for tr in trs {
accountant.transfer_signed(tr.clone()).unwrap();
client.transfer_signed(tr.clone()).unwrap();
}
});
println!("Waiting for transactions to complete...",);
let mut tx_count;
for _ in 0..10 {
tx_count = accountant.transaction_count();
tx_count = client.transaction_count();
duration = now.elapsed();
let txs = tx_count - initial_tx_count;
println!("Transactions processed {}", txs);

33
src/thin_client.rs
View File

@ -188,29 +188,22 @@ mod tests {
let bob_pubkey = KeyPair::new().pubkey();
let exit = Arc::new(AtomicBool::new(false));
let accounting_stage = AccountingStage::new(accountant, &alice.last_id(), Some(30));
let accountant = Arc::new(Tpu::new(accounting_stage));
let threads = Tpu::serve(
&accountant,
d,
serve,
events_socket,
gossip,
exit.clone(),
sink(),
).unwrap();
let tpu = Arc::new(Tpu::new(accounting_stage));
let threads =
Tpu::serve(&tpu, d, serve, events_socket, gossip, exit.clone(), sink()).unwrap();
sleep(Duration::from_millis(300));
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut accountant = ThinClient::new(addr, socket);
let last_id = accountant.get_last_id().wait().unwrap();
let _sig = accountant
let mut client = ThinClient::new(addr, socket);
let last_id = client.get_last_id().wait().unwrap();
let _sig = client
.transfer(500, &alice.keypair(), bob_pubkey, &last_id)
.unwrap();
let mut balance;
let now = Instant::now();
loop {
balance = accountant.get_balance(&bob_pubkey);
balance = client.get_balance(&bob_pubkey);
if balance.is_ok() {
break;
}
@ -372,15 +365,15 @@ mod tests {
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
socket.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
let mut accountant = ThinClient::new(leader.0.serve_addr, socket);
let mut client = ThinClient::new(leader.0.serve_addr, socket);
info!("getting leader last_id");
let last_id = accountant.get_last_id().wait().unwrap();
let last_id = client.get_last_id().wait().unwrap();
info!("executing leader transer");
let _sig = accountant
let _sig = client
.transfer(500, &alice.keypair(), bob_pubkey, &last_id)
.unwrap();
info!("getting leader balance");
accountant.get_balance(&bob_pubkey).unwrap()
client.get_balance(&bob_pubkey).unwrap()
};
assert_eq!(leader_balance, 500);
//verify replicant has the same balance
@ -389,9 +382,9 @@ mod tests {
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
socket.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
let mut accountant = ThinClient::new(replicant.0.serve_addr, socket);
let mut client = ThinClient::new(replicant.0.serve_addr, socket);
info!("getting replicant balance");
if let Ok(bal) = accountant.get_balance(&bob_pubkey) {
if let Ok(bal) = client.get_balance(&bob_pubkey) {
replicant_balance = bal;
}
info!("replicant balance {}", replicant_balance);