Migrate fullnode and fullnode-config to clap for CLI arguments

src/bin/fullnode-config.rs

@@ -1,57 +1,52 @@
-extern crate getopts;
+extern crate clap;
 extern crate serde_json;
 extern crate solana;
 
-use getopts::Options;
+use clap::{App, Arg};
 use solana::crdt::{get_ip_addr, parse_port_or_addr, ReplicatedData};
 use solana::nat::get_public_ip_addr;
-use std::env;
 use std::io;
 use std::net::SocketAddr;
-use std::process::exit;
-
-fn print_usage(program: &str, opts: Options) {
-    let mut brief = format!("Usage: {} [options]\n\n", program);
-    brief += "  Create a solana fullnode config file\n";
-
-    print!("{}", opts.usage(&brief));
-}
 
 fn main() {
-    let mut opts = Options::new();
+    let matches = App::new("fullnode-config")
-    opts.optopt("b", "", "bind", "bind to port or address");
+        .arg(
-    opts.optflag(
+            Arg::with_name("local")
-        "p",
+                .short("l")
-        "",
+                .long("local")
-        "detect public network address using public servers",
+                .takes_value(false)
-    );
+                .help("detect network address from local machine configuration"),
-    opts.optflag(
+        )
-        "l",
+        .arg(
-        "",
+            Arg::with_name("public")
-        "detect network address from local machine configuration",
+                .short("p")
-    );
+                .long("public")
-    opts.optflag("h", "help", "print help");
+                .takes_value(false)
-    let args: Vec<String> = env::args().collect();
+                .help("detect public network address using public servers"),
-    let matches = match opts.parse(&args[1..]) {
+        )
-        Ok(m) => m,
+        .arg(
-        Err(e) => {
+            Arg::with_name("bind")
-            eprintln!("{}", e);
+                .short("b")
-            exit(1);
+                .long("bind")
-        }
+                .value_name("PORT")
-    };
+                .takes_value(true)
-    if matches.opt_present("h") {
+                .help("bind to port or address"),
-        let program = args[0].clone();
+        )
-        print_usage(&program, opts);
+        .get_matches();
-        return;
-    }
 
     let bind_addr: SocketAddr = {
-        let mut bind_addr = parse_port_or_addr(matches.opt_str("b"));
+        let mut bind_addr = parse_port_or_addr({
-        if matches.opt_present("l") {
+            if let Some(b) = matches.value_of("bind") {
+                Some(b.to_string())
+            } else {
+                None
+            }
+        });
+        if matches.is_present("local") {
             let ip = get_ip_addr().unwrap();
             bind_addr.set_ip(ip);
         }
-        if matches.opt_present("p") {
+        if matches.is_present("public") {
             let ip = get_public_ip_addr().unwrap();
             bind_addr.set_ip(ip);
         }

src/bin/fullnode.rs

@@ -1,4 +1,5 @@
 extern crate atty;
+extern crate clap;
 extern crate env_logger;
 extern crate getopts;
 extern crate log;
@@ -6,11 +7,10 @@ extern crate serde_json;
 extern crate solana;
 
 use atty::{is, Stream};
-use getopts::Options;
+use clap::{App, Arg};
 use solana::crdt::{ReplicatedData, TestNode};
 use solana::fullnode::{FullNode, InFile, OutFile};
 use solana::service::Service;
-use std::env;
 use std::fs::File;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::process::exit;
@@ -18,46 +18,34 @@ use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 //use std::time::Duration;
 
-fn print_usage(program: &str, opts: Options) {
-    let mut brief = format!("Usage: cat <transaction.log> | {} [options]\n\n", program);
-    brief += "  Run a Solana node to handle transactions and\n";
-    brief += "  write a new transaction log to stdout.\n";
-    brief += "  Takes existing transaction log from stdin.";
-
-    print!("{}", opts.usage(&brief));
-}
-
 fn main() -> () {
     env_logger::init();
-    let mut opts = Options::new();
+    let matches = App::new("fullnode")
-    opts.optflag("h", "help", "print help");
+        .arg(
-    opts.optopt("l", "", "run with the identity found in FILE", "FILE");
+            Arg::with_name("identity")
-    opts.optopt(
+                .short("l")
-        "t",
+                .long("local")
-        "",
+                .value_name("FILE")
-        "testnet; connect to the network at this gossip entry point",
+                .takes_value(true)
-        "HOST:PORT",
+                .help("run with the identity found in FILE"),
-    );
+        )
-    opts.optopt(
+        .arg(
-        "o",
+            Arg::with_name("testnet")
-        "",
+                .short("t")
-        "output log to FILE, defaults to stdout (ignored by validators)",
+                .long("testnet")
-        "FILE",
+                .value_name("HOST:PORT")
-    );
+                .takes_value(true)
-
+                .help("testnet; connect to the network at this gossip entry point"),
-    let args: Vec<String> = env::args().collect();
+        )
-    let matches = match opts.parse(&args[1..]) {
+        .arg(
-        Ok(m) => m,
+            Arg::with_name("output")
-        Err(e) => {
+                .short("o")
-            eprintln!("{}", e);
+                .long("output")
-            exit(1);
+                .value_name("FILE")
-        }
+                .takes_value(true)
-    };
+                .help("output log to FILE, defaults to stdout (ignored by validators)"),
-    if matches.opt_present("h") {
+        )
-        let program = args[0].clone();
+        .get_matches();
-        print_usage(&program, opts);
-        return;
-    }
     if is(Stream::Stdin) {
         eprintln!("nothing found on stdin, expected a log file");
         exit(1);
@@ -65,8 +53,8 @@ fn main() -> () {
 
     let bind_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
     let mut repl_data = ReplicatedData::new_leader(&bind_addr);
-    if matches.opt_present("l") {
+    if let Some(l) = matches.value_of("identity") {
-        let path = matches.opt_str("l").unwrap();
+        let path = l.to_string();
         if let Ok(file) = File::open(path.clone()) {
             if let Ok(data) = serde_json::from_reader(file) {
                 repl_data = data;
@@ -81,15 +69,15 @@ fn main() -> () {
     }
     let mut node = TestNode::new_with_bind_addr(repl_data, bind_addr);
     let exit = Arc::new(AtomicBool::new(false));
-    let fullnode = if matches.opt_present("t") {
+    let fullnode = if let Some(t) = matches.value_of("testnet") {
-        let testnet_address_string = matches.opt_str("t").unwrap();
+        let testnet_address_string = t.to_string();
         let testnet_addr = testnet_address_string.parse().unwrap();
         FullNode::new(node, false, InFile::StdIn, Some(testnet_addr), None, exit)
     } else {
         node.data.current_leader_id = node.data.id.clone();
 
-        let outfile = if let Some(f) = matches.opt_str("o") {
+        let outfile = if let Some(o) = matches.value_of("output") {
-            OutFile::Path(f)
+            OutFile::Path(o.to_string())
         } else {
             OutFile::StdOut
         };