[refactor]: rename iroha_torii_<derive> to *_<macro>

Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>
hyperledger-iroha · Dec 14, 2023 · 0c07859 · 0c07859
1 parent 46367b0
commit 0c07859
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ categories = ["cryptography::cryptocurrencies"]
 iroha = { path = "cli" }
 iroha_dsl = { version = "=2.0.0-pre-rc.20", path = "dsl" }
 iroha_torii = { version = "=2.0.0-pre-rc.20", path = "torii" }
-iroha_torii_derive = { version = "=2.0.0-pre-rc.20", path = "torii/derive" }
+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" }
@@ -246,7 +246,7 @@ members = [
   "tools/wasm_builder_cli",
   "tools/wasm_test_runner",
   "torii",
-  "torii/derive",
+  "torii/macro",
   "version",
   "version/derive",
   "wasm_codec",

diff --git a/torii/Cargo.toml b/torii/Cargo.toml
@@ -30,7 +30,7 @@ iroha_primitives = { workspace = true }
 iroha_logger = { workspace = true }
 iroha_data_model = { workspace = true, features = ["http"] }
 iroha_version = { workspace = true, features = ["http"] }
-iroha_torii_derive = { workspace = true }
+iroha_torii_macro = { workspace = true }
 iroha_futures = { workspace = true }
 iroha_macro = { workspace = true }
 iroha_schema_gen = { workspace = true, optional = true }

diff --git a/torii/derive/Cargo.toml → torii/macro/Cargo.toml b/torii/derive/Cargo.toml → torii/macro/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "iroha_torii_derive"
+name = "iroha_torii_macro"
 
 edition.workspace = true
 version.workspace = true

diff --git a/torii/derive/src/lib.rs → torii/macro/src/lib.rs b/torii/derive/src/lib.rs → torii/macro/src/lib.rs
@@ -40,7 +40,7 @@ use syn::{
 /// use warp::{Rejection, Filter};
 /// use std::{convert::Infallible, marker::PhantomData};
 /// pub struct WarpResult<O, E>(Result<O, E>);
-/// use iroha_torii_derive::generate_endpoints;
+/// use iroha_torii_macro::generate_endpoints;
 ///
 /// // An example with arguments of both acceptable kinds.
 /// // This would generate endpoints accepting functions with

diff --git a/torii/src/utils.rs b/torii/src/utils.rs
@@ -81,4 +81,4 @@ impl<O: Reply, E: Reply> Reply for WarpResult<O, E> {
     }
 }
 
-iroha_torii_derive::generate_endpoints!(2, 3, 4, 5, 6, 7);
+iroha_torii_macro::generate_endpoints!(2, 3, 4, 5, 6, 7);
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,4 +81,4 @@ impl<O: Reply, E: Reply> Reply for WarpResult<O, E> { @@
         }
     }
-    iroha_torii_derive::generate_endpoints!(2, 3, 4, 5, 6, 7);
+    iroha_torii_macro::generate_endpoints!(2, 3, 4, 5, 6, 7);