Node information cli requests

Cargo.toml

@@ -34,14 +34,16 @@ name = "lnp-cli"
 required-features = ["cli"]
 
 [dependencies]
-# Rust language
+# LNP/BP crates
 amplify = "~2.2.1"
-amplify_derive = "~2.2.1"
+amplify_derive = "~2.2.2"
 lnpbp = { git = "git://github.com/LNP-BP/rust-lnpbp", features = ["lnp", "url", "websockets"] }
 lnpbp_derive = { git = "git://github.com/LNP-BP/rust-lnpbp" }
 lnpbp_services = { git = "git://github.com/LNP-BP/rust-lnpbp" }
 lazy_static = "~1.4.0"
+# Rust language
 nix = { version = "~0.19.0", optional = true }
+chrono = "~0.4.19"
 # Bitcoin
 electrum-client = { version = "=0.3.0-beta.1", optional = true }
 # Serialization & parsing
@@ -70,7 +72,7 @@ zmq = { version = "~0.9.2", optional = true }
 
 [build-dependencies]
 amplify = "~2.2.1"
-amplify_derive = "~2.2.1"
+amplify_derive = "~2.2.2"
 lnpbp = { git = "git://github.com/LNP-BP/rust-lnpbp", features = ["lnp", "url", "websockets"] }
 lnpbp_services = { git = "git://github.com/LNP-BP/rust-lnpbp" }
 clap = "=3.0.0-beta.2"
@@ -117,8 +119,8 @@ shell = [
 # This feature results in building with features not required for CLI
 node = ["serde", "lnpbp/keygen", "tokio", "lnpbp/tokio", "zmq", "lnpbp_services/node",
         "url", "lnpbp/url"]
-serde = ["serde_crate", "serde_with", "toml", "amplify/serde", "lnpbp/serde",
-         "lnpbp_services/serde"]
+serde = ["serde_crate", "serde_with", "serde_yaml", "toml",
+         "amplify/serde", "lnpbp/serde", "lnpbp_services/serde"]
 
 [package.metadata.configure_me]
 spec = "config_spec.toml"

src/bin/lnp-cli.rs

@@ -20,7 +20,7 @@ extern crate log;
 use clap::Clap;
 
 use lnp_node::cli::{Opts, Runtime};
-use lnp_node::Config;
+use lnp_node::{Config, LogStyle};
 use lnpbp_services::shell::Exec;
 
 fn main() {
@@ -42,5 +42,5 @@ fn main() {
     trace!("Executing command: {:?}", opts.command);
     opts.command
         .exec(&mut runtime)
-        .unwrap_or_else(|err| error!("{}", err));
+        .unwrap_or_else(|err| eprintln!("{}", err.err()));
 }

src/channeld/runtime.rs

@@ -73,7 +73,7 @@ impl Runtime {
     ) -> Result<(), Error> {
         let mut notify_cli = None;
         match request {
-            Request::LnpwpMessage(Messages::AcceptChannel(accept_channel)) => {
+            Request::SendMessage(Messages::AcceptChannel(accept_channel)) => {
                 info!(
                     "{} from the remote peer {} with temporary id {}",
                     "Accepting channel".promo(),
@@ -86,7 +86,7 @@ impl Runtime {
                 )));
             }
 
-            Request::LnpwpMessage(_) => {
+            Request::SendMessage(_) => {
                 // Ignore the rest of LN peer messages
             }
 
@@ -131,7 +131,7 @@ impl Runtime {
                     ServiceBus::Msg,
                     self.identity(),
                     peerd,
-                    Request::LnpwpMessage(Messages::OpenChannel(channel_req)),
+                    Request::SendMessage(Messages::OpenChannel(channel_req)),
                 )?;
                 notify_cli = Some((report_to, msg))
             }
@@ -168,7 +168,7 @@ impl Runtime {
                     ServiceBus::Msg,
                     self.identity(),
                     peerd,
-                    Request::LnpwpMessage(Messages::AcceptChannel(
+                    Request::SendMessage(Messages::AcceptChannel(
                         accept_channel,
                     )),
                 )?;

src/cli/command.rs

@@ -30,6 +30,21 @@ impl Exec for Command {
     fn exec(&self, runtime: &mut Self::Runtime) -> Result<(), Self::Error> {
         debug!("Performing {:?}: {}", self, self);
         match self {
+            Command::Info => {
+                runtime.request(ServiceId::Lnpd, Request::GetInfo)?;
+                runtime.report_response()?;
+            }
+
+            Command::Peers => {
+                runtime.request(ServiceId::Lnpd, Request::ListPeers)?;
+                runtime.report_response()?;
+            }
+
+            Command::Channels => {
+                runtime.request(ServiceId::Lnpd, Request::ListChannels)?;
+                runtime.report_response()?;
+            }
+
             Command::Listen {
                 ip_addr,
                 port,

src/cli/runtime.rs

@@ -69,6 +69,23 @@ impl Runtime {
         Ok(())
     }
 
+    pub fn report_response(&mut self) -> Result<(), Error> {
+        for (_, _, rep) in self.esb.recv_poll()? {
+            match rep {
+                Request::Failure(fail) => {
+                    eprintln!(
+                        "{}: {}",
+                        "Request failure".err(),
+                        fail.err_details()
+                    );
+                    Err(Error::from(fail))?
+                }
+                resp => println!("{:#}", resp),
+            }
+        }
+        Ok(())
+    }
+
     pub fn report_progress(&mut self) -> Result<usize, Error> {
         let mut counter = 0;
         let mut finished = false;

src/gossipd/runtime.rs

@@ -71,7 +71,7 @@ impl Runtime {
         request: Request,
     ) -> Result<(), Error> {
         match request {
-            Request::LnpwpMessage(_message) => {
+            Request::SendMessage(_message) => {
                 // TODO: Process message
             }
             _ => {

src/lib.rs

@@ -31,6 +31,10 @@ extern crate amplify_derive;
 #[macro_use]
 extern crate lnpbp_derive;
 
+#[cfg(feature = "serde")]
+#[macro_use]
+extern crate serde_crate as serde;
+
 #[cfg(feature = "shell")]
 extern crate clap;
 #[cfg(feature = "shell")]