Refactor ClientConfig, add serde to it

beacon_node/eth2-libp2p/src/config.rs

@@ -1,20 +1,22 @@
-use crate::Multiaddr;
+use clap::ArgMatches;
 use libp2p::gossipsub::{GossipsubConfig, GossipsubConfigBuilder};
+use serde_derive::{Deserialize, Serialize};
+use types::multiaddr::{Error as MultiaddrError, Multiaddr};
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(default)]
 /// Network configuration for lighthouse.
 pub struct Config {
-    //TODO: stubbing networking initial params, change in the future
     /// IP address to listen on.
-    pub listen_addresses: Vec<Multiaddr>,
-    /// Listen port UDP/TCP.
-    pub listen_port: u16,
+    listen_addresses: Vec<String>,
     /// Gossipsub configuration parameters.
+    #[serde(skip)]
     pub gs_config: GossipsubConfig,
     /// Configuration parameters for node identification protocol.
+    #[serde(skip)]
     pub identify_config: IdentifyConfig,
     /// List of nodes to initially connect to.
-    pub boot_nodes: Vec<Multiaddr>,
+    boot_nodes: Vec<String>,
     /// Client version
     pub client_version: String,
     /// List of topics to subscribe to as strings
@@ -25,15 +27,12 @@ impl Default for Config {
     /// Generate a default network configuration.
     fn default() -> Self {
         Config {
-            listen_addresses: vec!["/ip4/127.0.0.1/tcp/9000"
-                .parse()
-                .expect("is a correct multi-address")],
-            listen_port: 9000,
+            listen_addresses: vec!["/ip4/127.0.0.1/tcp/9000".to_string()],
             gs_config: GossipsubConfigBuilder::new()
                 .max_gossip_size(4_000_000)
                 .build(),
             identify_config: IdentifyConfig::default(),
-            boot_nodes: Vec::new(),
+            boot_nodes: vec![],
             client_version: version::version(),
             topics: vec![String::from("beacon_chain")],
         }
@@ -41,12 +40,34 @@ impl Default for Config {
 }
 
 impl Config {
-    pub fn new(boot_nodes: Vec<Multiaddr>) -> Self {
+    pub fn new(boot_nodes: Vec<String>) -> Self {
         let mut conf = Config::default();
         conf.boot_nodes = boot_nodes;
 
         conf
     }
+
+    pub fn listen_addresses(&self) -> Result<Vec<Multiaddr>, MultiaddrError> {
+        self.listen_addresses.iter().map(|s| s.parse()).collect()
+    }
+
+    pub fn boot_nodes(&self) -> Result<Vec<Multiaddr>, MultiaddrError> {
+        self.boot_nodes.iter().map(|s| s.parse()).collect()
+    }
+
+    pub fn apply_cli_args(&mut self, args: &ArgMatches) -> Result<(), &'static str> {
+        if let Some(listen_address_str) = args.value_of("listen-address") {
+            let listen_addresses = listen_address_str.split(",").map(Into::into).collect();
+            self.listen_addresses = listen_addresses;
+        }
+
+        if let Some(boot_addresses_str) = args.value_of("boot-nodes") {
+            let boot_addresses = boot_addresses_str.split(",").map(Into::into).collect();
+            self.boot_nodes = boot_addresses;
+        }
+
+        Ok(())
+    }
 }
 
 /// The configuration parameters for the Identify protocol

beacon_node/eth2-libp2p/src/service.rs

@@ -57,7 +57,7 @@ impl Service {
         };
 
         // listen on all addresses
-        for address in &config.listen_addresses {
+        for address in config.listen_addresses().expect("invalid listen multiaddr") {
             match Swarm::listen_on(&mut swarm, address.clone()) {
                 Ok(mut listen_addr) => {
                     listen_addr.append(Protocol::P2p(local_peer_id.clone().into()));
@@ -68,7 +68,7 @@ impl Service {
         }
         // connect to boot nodes - these are currently stored as multiaddrs
         // Once we have discovery, can set to peerId
-        for bootnode in config.boot_nodes {
+        for bootnode in config.boot_nodes().expect("invalid boot node multiaddr") {
             match Swarm::dial_addr(&mut swarm, bootnode.clone()) {
                 Ok(()) => debug!(log, "Dialing bootnode: {}", bootnode),
                 Err(err) => debug!(