Merge branch 'main' into link_checker

Cargo.toml

@@ -44,7 +44,6 @@ iroha_smart_contract_utils = { version = "=2.0.0-rc.1.0", path = "crates/iroha_s
 iroha_executor = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor" }
 
 iroha_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_data_model", default-features = false }
-iroha_multisig_data_model = { version = "=2.0.0-rc.1.0", path = "data_model/libs/iroha_multisig_data_model" }
 iroha_executor_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor_data_model" }
 
 iroha_test_network = { version = "=2.0.0-rc.1.0", path = "crates/iroha_test_network" }
@@ -199,7 +198,6 @@ clippy.wildcard_dependencies = "deny"
 resolver = "2"
 members = [
     "crates/*",
-    "data_model/libs/*",
     "data_model/samples/*"
 ]
 

crates/iroha/Cargo.toml

@@ -58,7 +58,7 @@ iroha_torii_const = { workspace = true }
 iroha_version = { workspace = true }
 
 iroha_data_model = { workspace = true, features = ["http"] }
-iroha_multisig_data_model = { workspace = true }
+iroha_executor_data_model = { workspace = true }
 
 attohttpc = { version = "0.28.0", default-features = false }
 eyre = { workspace = true }
@@ -88,7 +88,6 @@ iroha_test_network = { workspace = true }
 
 mint_rose_trigger_data_model = { path = "../../data_model/samples/mint_rose_trigger_data_model" }
 executor_custom_data_model = { path = "../../data_model/samples/executor_custom_data_model" }
-iroha_executor_data_model = { workspace = true }
 
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 reqwest = { version = "0.12.7", features = ["json"] }

crates/iroha/src/lib.rs

@@ -9,4 +9,4 @@ mod secrecy;
 
 pub use iroha_crypto as crypto;
 pub use iroha_data_model as data_model;
-pub use iroha_multisig_data_model as multisig_data_model;
+pub use iroha_executor_data_model as executor_data_model;