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

Cleanup Fullnode construction 

leader_id was already set by Fullnode constructor. And cleanup the
rest of that code while in the neighborhood.

Thanks @CriesofCarrots!
This commit is contained in:
Greg Fitzgerald 2018-08-23 13:33:45 -07:00 committed by Grimes
parent 4ab58f069a
commit 0c8eec2563
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/fullnode.rs
View File

@ -76,19 +76,14 @@ fn main() -> () {
let ledger_path = matches.value_of("ledger").unwrap();
let mut node = TestNode::new_with_bind_addr(repl_data, bind_addr);
let node = TestNode::new_with_bind_addr(repl_data, bind_addr);
let mut drone_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), DRONE_PORT);
let fullnode = if let Some(t) = matches.value_of("testnet") {
let testnet_address_string = t.to_string();
let testnet_addr: SocketAddr = testnet_address_string.parse().unwrap();
drone_addr.set_ip(testnet_addr.ip());
Fullnode::new(node, ledger_path, keypair, Some(testnet_addr), false)
} else {
node.data.leader_id = node.data.id;
Fullnode::new(node, ledger_path, keypair, None, false)
};
let testnet_addr = matches.value_of("testnet").map(|addr_str| {
let addr: SocketAddr = addr_str.parse().unwrap();
drone_addr.set_ip(addr.ip());
addr
});
let fullnode = Fullnode::new(node, ledger_path, keypair, testnet_addr, false);
let mut client = mk_client(&repl_clone);
let previous_balance = client.poll_get_balance(&leader_pubkey).unwrap_or(0);