Merge branch 'hyperledger:iroha2-dev' into iroha2-dev

Cargo.toml

@@ -16,7 +16,8 @@ categories = ["cryptography::cryptocurrencies"]
 [workspace.dependencies]
 iroha = { path = "cli" }
 iroha_dsl = { version = "=2.0.0-pre-rc.20", path = "dsl" }
-iroha_cli_derive = { version = "=2.0.0-pre-rc.20", path = "cli/derive" }
+iroha_torii = { version = "=2.0.0-pre-rc.20", path = "torii" }
+iroha_torii_macro = { version = "=2.0.0-pre-rc.20", path = "torii/macro" }
 iroha_macro_utils = { version = "=2.0.0-pre-rc.20", path = "macro/utils" }
 iroha_telemetry = { version = "=2.0.0-pre-rc.20", path = "telemetry" }
 iroha_telemetry_derive = { version = "=2.0.0-pre-rc.20", path = "telemetry/derive" }
@@ -205,7 +206,6 @@ clippy.wildcard_dependencies = "deny"
 resolver = "2"
 members = [
   "cli",
-  "cli/derive",
   "client",
   "client_cli",
   "config",
@@ -245,6 +245,8 @@ members = [
   "tools/swarm",
   "tools/wasm_builder_cli",
   "tools/wasm_test_runner",
+  "torii",
+  "torii/macro",
   "version",
   "version/derive",
   "wasm_codec",

cli/Cargo.toml

@@ -25,13 +25,13 @@ bridge = ["iroha_core/bridge"]
 # Support Decentralised Exchange, including functionality for atomic exchange instruction
 dex = ["iroha_core/dex"]
 # Support lightweight telemetry, including diagnostics
-telemetry = ["iroha_telemetry", "iroha_core/telemetry"]
+telemetry = ["iroha_telemetry", "iroha_core/telemetry", "iroha_torii/telemetry"]
 # Support developer-specific telemetry.
 # Should not be enabled on production builds.
 dev-telemetry = ["iroha_core/dev-telemetry", "iroha_telemetry"]
 # Support schema generation from the `schema` endpoint in the local binary.
 # Useful for debugging issues with decoding in SDKs.
-schema-endpoint = ["iroha_schema_gen"]
+schema-endpoint = ["iroha_torii/schema"]
 # Support internal testing infrastructure for integration tests.
 # Disable in production.
 test-network = ["thread-local-panic-hook"]
@@ -43,40 +43,25 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 iroha_core = { workspace = true }
-iroha_macro = { workspace = true }
 iroha_logger = { workspace = true }
 iroha_futures = { workspace = true }
 iroha_data_model = { workspace = true, features = ["http"] }
 iroha_primitives = { workspace = true }
 iroha_telemetry = { workspace = true, optional = true }
-iroha_version = { workspace = true, features = ["http"] }
 iroha_config = { workspace = true }
 iroha_crypto = { workspace = true }
 iroha_p2p = { workspace = true }
-iroha_schema_gen = { workspace = true, optional = true }
-iroha_cli_derive = { workspace = true }
+iroha_torii = { workspace = true }
 iroha_genesis = { workspace = true }
 iroha_wasm_builder = { workspace = true }
 
-
-derive_more = { workspace = true }
-async-trait = { workspace = true }
 color-eyre = { workspace = true }
 eyre = { workspace = true }
 tracing = { workspace = true }
-futures = { workspace = true, features = ["std", "async-await"] }
-parity-scale-codec = { workspace = true, features = ["derive"] }
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
-thiserror = { workspace = true }
-displaydoc = { workspace = true }
-tokio = { workspace = true, features = ["sync", "time", "rt", "io-util", "rt-multi-thread", "macros", "fs", "signal"] }
-warp = { workspace = true, features = ["multipart", "websocket"] }
+tokio = { workspace = true, features = ["macros", "signal"] }
 once_cell = { workspace = true }
 owo-colors = { workspace = true, features = ["supports-colors"] }
 supports-color = { workspace = true }
-tempfile = { workspace = true }
-dashmap = { workspace = true }
 
 thread-local-panic-hook = { version = "0.1.0", optional = true }
 
@@ -91,10 +76,10 @@ vergen = { workspace = true, features = ["cargo"] }
 
 [package.metadata.cargo-all-features]
 denylist = [
-"bridge",
-"dex",
-"schema-endpoint",
-"telemetry",
-"test-network"
+  "bridge",
+  "dex",
+  "schema-endpoint",
+  "telemetry",
+  "test-network",
 ] # TODO: remove `dex` and `bridge` once there's code for them.
 skip_optional_dependencies = true

cli/src/lib.rs

@@ -33,18 +33,15 @@ use iroha_core::{
 use iroha_data_model::prelude::*;
 use iroha_genesis::GenesisNetwork;
 use iroha_logger::actor::LoggerHandle;
+use iroha_torii::Torii;
 use tokio::{
     signal,
     sync::{broadcast, mpsc, Notify},
     task,
 };
-use torii::Torii;
 
-mod event;
 pub mod samples;
-mod stream;
 pub mod style;
-pub mod torii;
 
 /// Arguments for Iroha2.  Configuration for arguments is parsed from
 /// environment variables and then the appropriate object is