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

Revert "Revert "plug in new ledger""

Browse Source 
This reverts commit 57e928d1d0.
This commit is contained in:
Rob Walker
2018-08-03 11:06:06 -07:00
parent 210b9d346f
commit 5193819d8e
15 changed files with 299 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/fullnode.rs
View File

@@ -8,7 +8,7 @@ use clap::{App, Arg};
use solana::client::mk_client;
use solana::crdt::{NodeInfo, TestNode};
use solana::drone::DRONE_PORT;
use solana::fullnode::{Config, FullNode, LedgerFile};
use solana::fullnode::{Config, FullNode};
use solana::logger;
use solana::metrics::set_panic_hook;
use solana::service::Service;
@@ -41,11 +41,12 @@ fn main() -> () {
)
.arg(
Arg::with_name("ledger")
.short("L")
.short("l")
.long("ledger")
.value_name("FILE")
.value_name("DIR")
.takes_value(true)
.help("use FILE as persistent ledger (defaults to stdin/stdout)"),
.required(true)
.help("use DIR as persistent ledger location"),
)
.get_matches();
@@ -72,11 +73,7 @@ fn main() -> () {
let leader_pubkey = keypair.pubkey();
let repl_clone = repl_data.clone();
let ledger = if let Some(l) = matches.value_of("ledger") {
LedgerFile::Path(l.to_string())
} else {
LedgerFile::StdInOut
};
let ledger_path = matches.value_of("ledger").unwrap();
let mut 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);
@@ -85,11 +82,11 @@ fn main() -> () {
let testnet_addr: SocketAddr = testnet_address_string.parse().unwrap();
drone_addr.set_ip(testnet_addr.ip());
FullNode::new(node, false, ledger, keypair, Some(testnet_addr))
FullNode::new(node, false, ledger_path, keypair, Some(testnet_addr))
} else {
node.data.leader_id = node.data.id;
FullNode::new(node, true, ledger, keypair, None)
FullNode::new(node, true, ledger_path, keypair, None)
};
let mut client = mk_client(&repl_clone);