gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "plug in new ledger"

Browse Source 
This reverts commit 46d9ba5ca0.
This commit is contained in:
Rob Walker
2018-08-03 10:13:00 -07:00
parent e2c68d8775
commit 57e928d1d0
15 changed files with 181 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/thin_client.rs
View File

@ -289,26 +289,11 @@ mod tests {
use mint::Mint;
use service::Service;
use signature::{KeyPair, KeyPairUtil};
use std::fs::remove_dir_all;
use std::io::sink;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use transaction::{Instruction, Plan};
fn tmp_ledger_path(name: &str) -> String {
let keypair = KeyPair::new();
let id = {
let ids: Vec<_> = keypair
.pubkey()
.iter()
.map(|id| format!("{}", id))
.collect();
ids.join("")
};
format!("farf/{}-{}", name, id)
}
#[test]
fn test_thin_client() {
logger::setup();
@ -320,7 +305,6 @@ mod tests {
let bank = Bank::new(&alice);
let bob_pubkey = KeyPair::new().pubkey();
let exit = Arc::new(AtomicBool::new(false));
let ledger_path = tmp_ledger_path("thin_client");
let server = FullNode::new_leader(
leader_keypair,
@ -330,7 +314,7 @@ mod tests {
Some(Duration::from_millis(30)),
leader,
exit.clone(),
&ledger_path,
sink(),
false,
);
sleep(Duration::from_millis(900));
@ -367,7 +351,6 @@ mod tests {
let bob_pubkey = KeyPair::new().pubkey();
let exit = Arc::new(AtomicBool::new(false));
let leader_data = leader.data.clone();
let ledger_path = tmp_ledger_path("bad_sig");
let server = FullNode::new_leader(
leader_keypair,
@ -377,7 +360,7 @@ mod tests {
Some(Duration::from_millis(30)),
leader,
exit.clone(),
&ledger_path,
sink(),
false,
);
//TODO: remove this sleep, or add a retry so CI is stable
@ -414,7 +397,6 @@ mod tests {
assert_eq!(balance.unwrap(), 500);
exit.store(true, Ordering::Relaxed);
server.join().unwrap();
remove_dir_all(ledger_path).unwrap();
}
#[test]
@ -427,8 +409,6 @@ mod tests {
let bob_pubkey = KeyPair::new().pubkey();
let exit = Arc::new(AtomicBool::new(false));
let leader_data = leader.data.clone();
let ledger_path = tmp_ledger_path("client_check_signature");
let server = FullNode::new_leader(
leader_keypair,
bank,
@ -437,7 +417,7 @@ mod tests {
Some(Duration::from_millis(30)),
leader,
exit.clone(),
&ledger_path,
sink(),
false,
);
sleep(Duration::from_millis(300));
@ -463,6 +443,5 @@ mod tests {
exit.store(true, Ordering::Relaxed);
server.join().unwrap();
remove_dir_all(ledger_path).unwrap();
}
}