Networking simplification

Cargo.toml

@@ -30,6 +30,7 @@ std = [
     "async-std",
     "futures/thread-pool",
     "parking_lot",
+    "pin-project",
     "schnorrkel/getrandom", # TODO: necessary for signing; clarify in docs and in source code
     "soketto",
     "wasmtime",
@@ -66,7 +67,6 @@ num-bigint = { version = "0.4.3", default-features = false }
 num-rational = { version = "0.4.0", default-features = false, features = ["num-bigint"] }
 num-traits = { version = "0.2.15", default-features = false }
 pbkdf2 = { version = "0.11.0", default-features = false }
-pin-project = "1.0.8"
 prost = { version = "0.10.3", default-features = false, features = ["prost-derive"] }
 rand = { version = "0.8.5", default-features = false, features = ["std", "std_rng"] }  # TODO: rand is used in hack-y ways at the moment ; these features should be removed
 rand_chacha = { version = "0.3.1", default-features = false }
@@ -90,6 +90,7 @@ sqlite = { version = "0.26.0", optional = true, default-features = false, featur
 # Add here the crates that cannot function without the help of the operating system or environment.
 async-std = { version = "1.11.0", optional = true }
 parking_lot = { version = "0.12.0", optional = true }
+pin-project = { version = "1.0.8", optional = true }
 soketto = { version = "0.7.1", optional = true }
 
 # BELOW: DEPENDENCIES TO REMOVE

bin/full-node/Cargo.toml

@@ -22,6 +22,7 @@ ctrlc = "3.2.2"
 derive_more = "0.99.17"
 directories = "4.0.1"
 either = { version = "1.6.1", default-features = false }
+event-listener = { version = "2.5.2" }
 fnv = { version = "1.0.7", default-features = false }
 futures = { version = "0.3.21", default-features = false, features = ["std", "thread-pool"] }
 futures-timer = "3.0"

bin/full-node/src/cli.rs

@@ -47,23 +47,11 @@ use std::{net::SocketAddr, path::PathBuf};
 pub enum CliOptions {
     /// Connects to the chain and synchronizes the local database with the network.
     Run(CliOptionsRun),
-    /// Connects to an IP address and prints some information about the node.
-    NodeInfo(CliOptionsNodeInfo),
     /// Computes the 64 bits BLAKE2 hash of a string payload and prints the hexadecimal-encoded hash.
     #[structopt(name = "blake2-64bits-hash")]
     Blake264BitsHash(CliOptionsBlake264Hash),
 }
 
-#[derive(Debug, clap::StructOpt)]
-pub struct CliOptionsNodeInfo {
-    /// IP address to connect to (format: `<ip>:<port>`).
-    // Note: we accept a String rather than a SocketAddr in order to allow for DNS addresses.
-    pub address: String,
-    /// Ed25519 private key of network identity (as a seed phrase).
-    #[structopt(long, parse(try_from_str = decode_ed25519_private_key))]
-    pub libp2p_key: Option<[u8; 32]>,
-}
-
 #[derive(Debug, clap::StructOpt)]
 pub struct CliOptionsRun {
     /// Chain to connect to ("Polkadot", "Kusama", "Westend", or a file path).

bin/full-node/src/main.rs

@@ -20,7 +20,6 @@
 #![deny(unused_crate_dependencies)]
 
 mod cli;
-mod node_info;
 mod run;
 
 fn main() {
@@ -30,7 +29,6 @@ fn main() {
 async fn async_main() {
     match <cli::CliOptions as clap::Parser>::parse() {
         cli::CliOptions::Run(r) => run::run(r).await,
-        cli::CliOptions::NodeInfo(opt) => node_info::run(opt).await,
         cli::CliOptions::Blake264BitsHash(opt) => {
             let hash = blake2_rfc::blake2b::blake2b(8, &[], opt.payload.as_bytes());
             println!("0x{}", hex::encode(hash));