Reducing dependencies to minimum; new feature system

Author: dr-orlovsky

Cargo.lock

@@ -38,8 +38,8 @@ rgb20 = { version = "0.3.0-rc.2", optional = true }
 rgb21 = { version = "0.3.0-beta.3", optional = true }
 rgb22 = { version = "0.3.0-beta.3", optional = true }
 rgb23 = { version = "0.3.0-beta.3", optional = true }
-internet2 = "0.3.1"
-microservices = "0.3"
+internet2 = { version = "0.3.4", default-features = false, features = ["derive"] }
+microservices = { version = "0.3.2", default-features = false }
 # Bitcoin
 bitcoin = "0.26"
 electrum-client = { version = "0.5.0-beta.1", optional = true, git = "https://github.com/LNP-BP/rust-electrum-client", branch = "bitcoin-0.26" }
@@ -57,26 +57,15 @@ serde_yaml = { version = "0.8", optional = true }
 toml = { version = "0.5", optional = true }
 bech32 = { version = "0.7", optional = true }
 base64 = { version = "0.12", optional = true }
-regex = { version = "1.3", optional = true }
-url = { version = "2.1", optional = true }
 # Congig & logging
+log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
+env_logger = "0.7"
+clap = { version = "3.0.0-beta.2", optional = true }
 settings = { version = "0.10", package = "config", optional = true }
 configure_me = { version = "0.3", optional = true }
 dotenv = { version = "0.15", optional = true }
-clap = { version = "3.0.0-beta.2", optional = true }
-log = { version = "0.4", optional = true, features = ["max_level_trace", "release_max_level_debug"] }
-env_logger = { version = "0.7", optional = true }
 colored = { version = "2.0", optional = true }
 shellexpand = { version = "2.0", optional = true }
-# Processes & IPC
-zmq = { version = "0.9", optional = true }
-
-[target.'cfg(target_os="android")'.dependencies]
-zmq = { version = "0.9", features = ["vendored"] }
-
-[patch.crates-io]
-# Remove this once https://github.com/jean-airoldie/zeromq-src-rs/pull/15 got merged
-zeromq-src = { git = "https://github.com/LNP-BP/zeromq-src-rs", branch = "fix/cmake" }
 
 # Recommended set of features:
 # 1. Standalone node: `server` (=`node`+`shell`)
@@ -85,35 +74,44 @@ zeromq-src = { git = "https://github.com/LNP-BP/zeromq-src-rs", branch = "fix/cm
 # 4. Mobile app with embedded node: `embedded` (auto includes `client` + `node`)
 # 5. Simple cli utility app: `shell`
 [features]
-default = ["client", "server", "fungibles", "collectibles", "identities", "auditlogs"]
+default = ["client", "fungibles"]
+
 # Server is a standalone application that runs daemon
 server = ["node", "shell", "nix", "microservices/server"]
-# Feature is required for any applications that talks to daemon processes
-client = ["zmq", "microservices/client", "bitcoin/rand",
-          "regex", "electrum-client", "base64",
-          "url", "internet2/url", "log", "env_logger",
-          # TODO: Femove the following after feature gates debugging:
-          "clap"]
-# Embedded is an app that contains node in itself and that talks to it through
+# Command-line application feature
+cli = ["shell", "client", "serde", "microservices/cli"]
+
+# Embedded is an app that contains embedded node and that talks to it through
 # integration layer
 embedded = ["client", "node", "microservices/embedded"]
-# Command-line application feature
-cli = ["shell", "client", "microservices/cli"]
+# Server node can be run as a part of mobile app and other types of clients;
+# thus `server` != `node`.
+# This feature results in building with features not required for command-line
+node = ["serde", "internet2/keygen", "bitcoin/rand", "internet2/zmq", "microservices/node",
+        "internet2/url", "electrum-client", "base64",
+        # Required for storing config and cache
+        "_config", "_rpc"]
+# Feature is required for any applications that talks to daemon processes
+client = ["internet2/zmq", "microservices/client", "microservices/node", "bitcoin/rand",
+          "electrum-client", "base64",
+          "internet2/url", "clap", "_rpc"]
 # Required for all apps that can be launched from command-line shell as binaries
 # (i.e. both servers and cli)
 shell = [
-    "dotenv", "clap", "settings", "configure_me", "log", "env_logger", "serde",
+    "dotenv", "clap", "settings", "configure_me", "serde",
     "amplify/parse_arg", "microservices/shell", "shellexpand", "colored"
 ]
-# Besides server node can be run as a part of mobile app
-# and other types of clients; thus `server` != `node`.
-# This feature results in building with features not required for CLI
-node = ["serde", "internet2/keygen", "bitcoin/rand", "zmq", "microservices/node",
-        "url", "internet2/url", "regex", "electrum-client", "base64",
-        # Required for storing config and cache
-        "serde_yaml", "toml"]
+
+# Internally used features for convenience
+_config = ["serde_yaml", "toml"]
+_rpc = []
+
 serde = ["serde_crate", "serde_with", "serde_yaml", "serde_json", "toml",
-         "amplify/serde", "lnpbp/serde", "internet2/serde", "chrono/serde", "bitcoin/serde", "rgb20/serde"]
+         "amplify/serde", "lnpbp/serde", "internet2/serde", "microservices/serde",
+         "chrono/serde", "bitcoin/serde", "rgb20/serde"]
+tor = ["microservices/tor", "internet2/tor"]
+vendored_openssl = ["microservices/vendored_openssl", "internet2/vendored_openssl"]
+
 # Schema-specific components exposed as features:
 fungibles = ["rgb20"]
 collectibles = ["rgb21"]

Cargo.toml

@@ -31,7 +31,7 @@ use super::{Error, OutputFormat, Runtime};
 use crate::rpc::fungible::{AcceptApi, Issue, TransferApi};
 use crate::rpc::{reply, Reply};
 use crate::util::file::ReadWrite;
-use crate::DataFormat;
+use microservices::FileFormat;
 
 #[derive(Clap, Clone, Debug, Display)]
 #[display(Debug)]
@@ -175,10 +175,11 @@ impl Command {
             }
             Reply::Sync(reply::SyncFormat(input_format, data)) => {
                 let assets: Vec<Asset> = match input_format {
-                    DataFormat::Yaml => serde_yaml::from_slice(&data)?,
-                    DataFormat::Json => serde_json::from_slice(&data)?,
-                    DataFormat::Toml => toml::from_slice(&data)?,
-                    DataFormat::StrictEncode => strict_deserialize(&data)?,
+                    FileFormat::Yaml => serde_yaml::from_slice(&data)?,
+                    FileFormat::Json => serde_json::from_slice(&data)?,
+                    FileFormat::Toml => toml::from_slice(&data)?,
+                    FileFormat::StrictEncode => strict_deserialize(&data)?,
+                    _ => unimplemented!(),
                 };
                 let short: Vec<HashMap<&str, String>> = assets
                     .iter()

src/cli/fungible.rs

@@ -27,7 +27,7 @@ use crate::error::{BootstrapError, ServiceErrorDomain};
 use crate::rpc::fungible::{self, AcceptApi, Issue, TransferApi};
 use crate::rpc::stash;
 use crate::rpc::Reply;
-use crate::DataFormat;
+use microservices::FileFormat;
 
 pub struct Runtime {
     stash_rpc: session::Raw<PlainTranscoder, transport::zmqsocket::Connection>,
@@ -108,10 +108,10 @@ impl Runtime {
         output_format: OutputFormat,
     ) -> Result<Arc<Reply>, Error> {
         let data_format = match output_format {
-            OutputFormat::Yaml => DataFormat::Yaml,
-            OutputFormat::Json => DataFormat::Json,
-            OutputFormat::Toml => DataFormat::Toml,
-            OutputFormat::StrictEncode => DataFormat::StrictEncode,
+            OutputFormat::Yaml => FileFormat::Yaml,
+            OutputFormat::Json => FileFormat::Json,
+            OutputFormat::Toml => FileFormat::Toml,
+            OutputFormat::StrictEncode => FileFormat::StrictEncode,
             _ => unimplemented!("The provided output format is not supported for this operation")
         };
         Ok(self.fungible_command(fungible::Request::Sync(data_format))?)