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

Remove unneeded Option

This commit is contained in:
Michael Vines 2019-01-31 12:44:09 -08:00
parent 8ba1d5f426
commit 9767468b7f
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
replicator/src/main.rs
View File

@ -41,7 +41,7 @@ fn main() {
) )
.get_matches(); .get_matches();
let ledger_path = matches.value_of("ledger"); let ledger_path = matches.value_of("ledger").unwrap();
let (keypair, gossip) = if let Some(i) = matches.value_of("identity") { let (keypair, gossip) = if let Some(i) = matches.value_of("identity") {
let path = i.to_string(); let path = i.to_string();

11
src/replicator.rs
View File

@ -102,7 +102,7 @@ impl Replicator {
/// Returns a Result that contains a replicator on success /// Returns a Result that contains a replicator on success
/// ///
/// # Arguments /// # Arguments
/// * `ledger_path` - (Not actually optional) path to where the ledger will be stored. /// * `ledger_path` - path to where the ledger will be stored.
/// Causes panic if none /// Causes panic if none
/// * `node` - The replicator node /// * `node` - The replicator node
/// * `leader_info` - NodeInfo representing the leader /// * `leader_info` - NodeInfo representing the leader
@ -111,7 +111,7 @@ impl Replicator {
/// 30 seconds /// 30 seconds
#[allow(clippy::new_ret_no_self)] #[allow(clippy::new_ret_no_self)]
pub fn new( pub fn new(
ledger_path: Option<&str>, ledger_path: &str,
node: Node, node: Node,
leader_info: &NodeInfo, leader_info: &NodeInfo,
keypair: &Keypair, keypair: &Keypair,
@ -138,8 +138,7 @@ impl Replicator {
// in the ledger located at ledger_path, and will only append on newly received // in the ledger located at ledger_path, and will only append on newly received
// entries after being passed to window_service // entries after being passed to window_service
let db_ledger = Arc::new( let db_ledger = Arc::new(
DbLedger::open(&ledger_path.unwrap()) DbLedger::open(ledger_path).expect("Expected to be able to open database ledger"),
.expect("Expected to be able to open database ledger"),
); );
let gossip_service = GossipService::new( let gossip_service = GossipService::new(
@ -223,9 +222,9 @@ impl Replicator {
let mut client = mk_client(&leader); let mut client = mk_client(&leader);
Self::get_airdrop_tokens(&mut client, keypair, &leader_info); Self::get_airdrop_tokens(&mut client, keypair, &leader_info);
info!("Done downloading ledger at {}", ledger_path.unwrap()); info!("Done downloading ledger at {}", ledger_path);
let ledger_path = Path::new(ledger_path.unwrap()); let ledger_path = Path::new(ledger_path);
let ledger_data_file_encrypted = ledger_path.join("ledger.enc"); let ledger_data_file_encrypted = ledger_path.join("ledger.enc");
let mut sampling_offsets = Vec::new(); let mut sampling_offsets = Vec::new();

6
tests/replicator.rs
View File

@ -125,7 +125,7 @@ fn test_replicator_startup() {
let leader_info = NodeInfo::new_entry_point(&leader_info.gossip); let leader_info = NodeInfo::new_entry_point(&leader_info.gossip);
let replicator = Replicator::new( let replicator = Replicator::new(
Some(replicator_ledger_path), replicator_ledger_path,
replicator_node, replicator_node,
&leader_info, &leader_info,
&replicator_keypair, &replicator_keypair,
@ -237,7 +237,7 @@ fn test_replicator_startup_leader_hang() {
let leader_info = NodeInfo::new_entry_point(&fake_gossip); let leader_info = NodeInfo::new_entry_point(&fake_gossip);
let replicator_res = Replicator::new( let replicator_res = Replicator::new(
Some(replicator_ledger_path), replicator_ledger_path,
replicator_node, replicator_node,
&leader_info, &leader_info,
&replicator_keypair, &replicator_keypair,
@ -314,7 +314,7 @@ fn test_replicator_startup_ledger_hang() {
let leader_info = NodeInfo::new_entry_point(&leader_info.gossip); let leader_info = NodeInfo::new_entry_point(&leader_info.gossip);
let replicator_res = Replicator::new( let replicator_res = Replicator::new(
Some(replicator_ledger_path), replicator_ledger_path,
replicator_node, replicator_node,
&leader_info, &leader_info,
&bad_keys, &bad_keys,