[feature] hyperledger-iroha#2073: Prefer ConstString over String for …

…types in blockchain (hyperledger-iroha#2505) * [feature] hyperledger-iroha#2073: Prefer ConstString over String for data_model Signed-off-by: Ales Tsurko <ales.tsurko@gmail.com> * [feature] hyperledger-iroha#2073: Encapsulate iroha_data_primitives into shared crate Signed-off-by: Ales Tsurko <ales.tsurko@gmail.com> * [feature] hyperledger-iroha#2073: Use ConstString in crypto Signed-off-by: Ales Tsurko <ales.tsurko@gmail.com> * [feature] hyperledger-iroha#2073: Rename data_primitives crate into primitives Signed-off-by: Ales Tsurko <ales.tsurko@gmail.com>
mversic · Jul 22, 2022 · 9c5c531 · 9c5c531
1 parent 425e7fc
commit 9c5c531
Show file tree

Hide file tree

Showing 45 changed files with 125 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,11 +12,8 @@ members = [
   "core",
   "core/test_network",
   "crypto",
-  "tools/kura_inspector",
-  "tools/parity_scale_decoder",
-  "tools/kagami",
   "data_model",
-  "data_model/primitives",
+  "primitives",
   "ffi",
   "ffi/derive",
   "futures",
@@ -27,10 +24,13 @@ members = [
   "p2p",
   "permissions_validators",
   "schema",
-  "schema/gen",
   "schema/derive",
+  "schema/gen",
   "substrate",
   "telemetry",
+  "tools/kagami",
+  "tools/kura_inspector",
+  "tools/parity_scale_decoder",
   "version",
   "version/derive",
 ]

diff --git a/actor/Cargo.toml b/actor/Cargo.toml
@@ -14,7 +14,7 @@ deadlock_detection = ["petgraph"]
 [dependencies]
 iroha_actor_derive = { version = "=2.0.0-pre-rc.5", path = "derive" }
 iroha_logger = { version = "=2.0.0-pre-rc.5", path = "../logger" }
-iroha_data_primitives = { version = "=2.0.0-pre-rc.5", path = "../data_model/primitives" }
+iroha_primitives = { version = "=2.0.0-pre-rc.5", path = "../primitives" }
 
 async-trait = "0.1"
 once_cell = "1.8.0"

diff --git a/actor/src/broker.rs b/actor/src/broker.rs
@@ -59,7 +59,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use dashmap::{mapref::entry::Entry, DashMap};
 use futures::{prelude::*, stream::FuturesUnordered};
-use iroha_data_primitives::small::{self, SmallVec};
+use iroha_primitives::small::{self, SmallVec};
 
 use super::*;
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -18,12 +18,13 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 iroha_config = { version = "=2.0.0-pre-rc.5", path = "../config" }
+iroha_core = { version = "=2.0.0-pre-rc.5", path = "../core", features = ["dev-telemetry", "telemetry"]}
 iroha_crypto = { version = "=2.0.0-pre-rc.5", path = "../crypto"}
 iroha_data_model = { version = "=2.0.0-pre-rc.5", path = "../data_model", features = ["warp"] }
+iroha_primitives = { version = "=2.0.0-pre-rc.5", path = "../primitives" }
 iroha_logger = { version = "=2.0.0-pre-rc.5", path = "../logger"}
 iroha_telemetry = { version ="=2.0.0-pre-rc.5", path = "../telemetry" }
 iroha_version = { version = "=2.0.0-pre-rc.5", path = "../version" }
-iroha_core = { version = "=2.0.0-pre-rc.5", path = "../core", features = ["dev-telemetry", "telemetry"]}
 
 attohttpc = "0.18"
 eyre = "0.6.5"

diff --git a/client/benches/torii.rs b/client/benches/torii.rs
@@ -11,6 +11,7 @@ use iroha_core::{
     prelude::*,
 };
 use iroha_data_model::prelude::*;
+use iroha_primitives::small::SmallStr;
 use iroha_version::Encode;
 use test_network::{get_key_pair, Peer as TestPeer, PeerBuilder, TestRuntime};
 use tokio::runtime::Runtime;
@@ -65,14 +66,14 @@ fn query_requests(criterion: &mut Criterion) {
     let mut client_config = iroha_client::samples::get_client_config(&get_key_pair());
 
     // TODO: We should definitely turn this into type-checked state. `String` is a terrible bodge
-    client_config.torii_api_url = small::SmallStr::from_string(peer.api_address.clone());
+    client_config.torii_api_url = SmallStr::from_string(peer.api_address.clone());
     if !client_config.torii_api_url.starts_with("http://") {
         client_config.torii_api_url =
-            small::SmallStr::from_string(format!("http://{}", client_config.torii_api_url));
+            SmallStr::from_string(format!("http://{}", client_config.torii_api_url));
     }
     if !client_config.torii_telemetry_url.starts_with("http://") {
         client_config.torii_telemetry_url =
-            small::SmallStr::from_string(format!("http://{}", client_config.torii_telemetry_url));
+            SmallStr::from_string(format!("http://{}", client_config.torii_telemetry_url));
     }
     let iroha_client = Client::new(&client_config).expect("Invalid client configuration");
     thread::sleep(std::time::Duration::from_millis(5000));
@@ -149,14 +150,14 @@ fn instruction_submits(criterion: &mut Criterion) {
     let create_account = RegisterBox::new(Account::new(account_id.clone(), [public_key]));
     let asset_definition_id = AssetDefinitionId::new("xor".parse().expect("Valid"), domain_id);
     let mut client_config = iroha_client::samples::get_client_config(&get_key_pair());
-    client_config.torii_api_url = small::SmallStr::from_string(peer.api_address.clone());
+    client_config.torii_api_url = SmallStr::from_string(peer.api_address.clone());
     if !client_config.torii_api_url.starts_with("http://") {
         client_config.torii_api_url =
-            small::SmallStr::from_string(format!("http://{}", client_config.torii_api_url));
+            SmallStr::from_string(format!("http://{}", client_config.torii_api_url));
     }
     if !client_config.torii_telemetry_url.starts_with("http://") {
         client_config.torii_telemetry_url =
-            small::SmallStr::from_string(format!("http://{}", client_config.torii_telemetry_url));
+            SmallStr::from_string(format!("http://{}", client_config.torii_telemetry_url));
     }
     let iroha_client = Client::new(&client_config).expect("Invalid client configuration");
     thread::sleep(std::time::Duration::from_millis(5000));

diff --git a/client/src/client.rs b/client/src/client.rs
@@ -12,12 +12,12 @@ use iroha_core::smartcontracts::isi::query::Error as QueryError;
 use iroha_crypto::{HashOf, KeyPair};
 use iroha_data_model::{predicate::PredicateBox, prelude::*, query::SignedQueryRequest};
 use iroha_logger::prelude::*;
+use iroha_primitives::small::SmallStr;
 use iroha_telemetry::metrics::Status;
 use iroha_version::prelude::*;
 use parity_scale_codec::DecodeAll;
 use rand::Rng;
 use serde::de::DeserializeOwned;
-use small::SmallStr;
 
 use crate::{
     config::Configuration,

diff --git a/client/src/config.rs b/client/src/config.rs
@@ -6,8 +6,8 @@ use iroha_config::derive::Configurable;
 use iroha_crypto::prelude::*;
 use iroha_data_model::{prelude::*, transaction};
 use iroha_logger::Configuration as LoggerConfiguration;
+use iroha_primitives::small::SmallStr;
 use serde::{Deserialize, Serialize};
-use small::SmallStr;
 
 const DEFAULT_TORII_TELEMETRY_URL: &str = "127.0.0.1:8180";
 const DEFAULT_TRANSACTION_TIME_TO_LIVE_MS: u64 = 100_000;
@@ -100,8 +100,8 @@ impl Default for Configuration {
             private_key,
             account_id: Self::placeholder_account(),
             basic_auth: None,
-            torii_api_url: small::SmallStr::from_str(uri::DEFAULT_API_URL),
-            torii_telemetry_url: small::SmallStr::from_str(DEFAULT_TORII_TELEMETRY_URL),
+            torii_api_url: SmallStr::from_str(uri::DEFAULT_API_URL),
+            torii_telemetry_url: SmallStr::from_str(DEFAULT_TORII_TELEMETRY_URL),
             transaction_time_to_live_ms: DEFAULT_TRANSACTION_TIME_TO_LIVE_MS,
             transaction_status_timeout_ms: DEFAULT_TRANSACTION_STATUS_TIMEOUT_MS,
             transaction_limits: TransactionLimits {

diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -24,7 +24,7 @@ pub mod samples {
             public_key,
             private_key,
             account_id: "alice@wonderland".parse().expect("Should not fail."),
-            torii_api_url: iroha_data_model::small::SmallStr::from_str(uri::DEFAULT_API_URL),
+            torii_api_url: iroha_primitives::small::SmallStr::from_str(uri::DEFAULT_API_URL),
             ..Configuration::default()
         }
     }

diff --git a/client/tests/integration/asset.rs b/client/tests/integration/asset.rs
@@ -4,7 +4,8 @@ use std::{str::FromStr as _, thread};
 
 use eyre::Result;
 use iroha_client::client;
-use iroha_data_model::{fixed::Fixed, prelude::*};
+use iroha_data_model::prelude::*;
+use iroha_primitives::fixed::Fixed;
 use test_network::*;
 
 use super::Configuration;

diff --git a/client/tests/integration/multisignature_transaction.rs b/client/tests/integration/multisignature_transaction.rs
@@ -8,6 +8,7 @@ use iroha_client::{
 };
 use iroha_core::prelude::*;
 use iroha_data_model::{account::TRANSACTION_SIGNATORIES_VALUE, prelude::*};
+use iroha_primitives::small::SmallStr;
 use test_network::*;
 
 use super::Configuration;
@@ -71,7 +72,7 @@ fn multisignature_transactions_should_wait_for_all_signatures() {
     thread::sleep(pipeline_time);
 
     //Then
-    client_configuration.torii_api_url = small::SmallStr::from_string(
+    client_configuration.torii_api_url = SmallStr::from_string(
         "http://".to_owned() + &network.peers.values().last().unwrap().api_address,
     );
     let iroha_client_1 = Client::new(&client_configuration).expect("Invalid client configuration");

diff --git a/client/tests/integration/transfer_asset.rs b/client/tests/integration/transfer_asset.rs
@@ -3,6 +3,7 @@
 use iroha_client::client;
 use iroha_core::prelude::*;
 use iroha_data_model::{prelude::*, Registered};
+use iroha_primitives::fixed::Fixed;
 use test_network::*;
 
 #[test]

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -34,17 +34,18 @@ is-it-maintained-open-issues = { repository = "https://github.com/hyperledger/ir
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-iroha_data_model = { version = "=2.0.0-pre-rc.5", path = "../data_model", features = ["mutable_api", "warp"] }
-iroha_macro = { version = "=2.0.0-pre-rc.5", path = "../macro" }
-iroha_p2p = { version = "=2.0.0-pre-rc.5", path = "../p2p" }
-iroha_logger = { version = "=2.0.0-pre-rc.5", path = "../logger"}
-iroha_crypto = { version = "=2.0.0-pre-rc.5", path = "../crypto" }
-iroha_version = { version = "=2.0.0-pre-rc.5", path = "../version", features = ["warp"] }
 iroha_actor = { version = "=2.0.0-pre-rc.5", path = "../actor" }
 iroha_config = { version = "=2.0.0-pre-rc.5", path = "../config" }
+iroha_crypto = { version = "=2.0.0-pre-rc.5", path = "../crypto" }
+iroha_data_model = { version = "=2.0.0-pre-rc.5", path = "../data_model", features = ["mutable_api", "warp"] }
+iroha_primitives = { version = "=2.0.0-pre-rc.5", path = "../primitives" }
 iroha_futures = { version = "=2.0.0-pre-rc.5", path = "../futures" }
-iroha_telemetry = { version = "=2.0.0-pre-rc.5", path = "../telemetry" }
+iroha_logger = { version = "=2.0.0-pre-rc.5", path = "../logger"}
+iroha_macro = { version = "=2.0.0-pre-rc.5", path = "../macro" }
+iroha_p2p = { version = "=2.0.0-pre-rc.5", path = "../p2p" }
 iroha_schema = { version = "=2.0.0-pre-rc.5", path = "../schema" }
+iroha_telemetry = { version = "=2.0.0-pre-rc.5", path = "../telemetry" }
+iroha_version = { version = "=2.0.0-pre-rc.5", path = "../version", features = ["warp"] }
 
 async-trait = "0.1"
 async-stream = "0.3.2"

diff --git a/core/src/genesis.rs b/core/src/genesis.rs
@@ -10,9 +10,9 @@ use eyre::{eyre, Result, WrapErr};
 use iroha_actor::Addr;
 use iroha_crypto::{KeyPair, PublicKey};
 use iroha_data_model::{asset::AssetDefinition, prelude::*};
+use iroha_primitives::small::{smallvec, SmallVec};
 use iroha_schema::prelude::*;
 use serde::{Deserialize, Serialize};
-use small::{smallvec, SmallVec};
 use tokio::{time, time::Duration};
 
 pub use self::config::GenesisConfiguration;
@@ -421,7 +421,7 @@ impl RawGenesisBlockBuilder {
     pub fn new() -> Self {
         RawGenesisBlockBuilder {
             transaction: GenesisTransaction {
-                isi: iroha_data_model::small::SmallVec::new(),
+                isi: SmallVec::new(),
             },
         }
     }

diff --git a/core/src/smartcontracts/isi/asset.rs b/core/src/smartcontracts/isi/asset.rs
@@ -1,10 +1,8 @@
 //! This module contains [`Asset`] structure, it's implementation and related traits and
 //! instructions implementations.
 
-use iroha_data_model::{
-    prelude::*,
-    primitives::{CheckedOp, IntoMetric},
-};
+use iroha_data_model::prelude::*;
+use iroha_primitives::{fixed::Fixed, CheckedOp, IntoMetric};
 use iroha_telemetry::metrics;
 
 use super::prelude::*;

diff --git a/core/src/smartcontracts/isi/mod.rs b/core/src/smartcontracts/isi/mod.rs
@@ -16,6 +16,7 @@ pub use error::*;
 use eyre::Result;
 use iroha_data_model::{expression::prelude::*, isi::*, prelude::*};
 use iroha_logger::prelude::*;
+use iroha_primitives::fixed::Fixed;
 
 use super::{Evaluate, Execute};
 use crate::{prelude::*, wsv::WorldStateView};
@@ -30,7 +31,8 @@ pub mod error {
 
     use derive_more::Display;
     use iroha_crypto::HashOf;
-    use iroha_data_model::{fixed::FixedPointOperationError, metadata, prelude::*, trigger};
+    use iroha_data_model::{metadata, prelude::*, trigger};
+    use iroha_primitives::fixed::FixedPointOperationError;
     use iroha_schema::IntoSchema;
     use parity_scale_codec::{Decode, Encode};
     use thiserror::Error;

diff --git a/core/src/wsv.rs b/core/src/wsv.rs
@@ -11,8 +11,9 @@ use dashmap::{
 use eyre::Result;
 use getset::Getters;
 use iroha_crypto::HashOf;
-use iroha_data_model::{prelude::*, small::SmallVec};
+use iroha_data_model::prelude::*;
 use iroha_logger::prelude::*;
+use iroha_primitives::small::SmallVec;
 use iroha_telemetry::metrics::Metrics;
 use tokio::{sync::broadcast, task};
 

diff --git a/core/test_network/Cargo.toml b/core/test_network/Cargo.toml
@@ -15,6 +15,7 @@ iroha_actor = { version = "=2.0.0-pre-rc.5", path = "../../actor" }
 iroha_client = { version = "=2.0.0-pre-rc.5", path = "../../client" }
 iroha_core = { version = "=2.0.0-pre-rc.5", path = "../../core" }
 iroha_data_model = { version = "=2.0.0-pre-rc.5", path = "../../data_model" }
+iroha_primitives = { version = "=2.0.0-pre-rc.5", path = "../../primitives" }
 iroha_logger = { version = "=2.0.0-pre-rc.5", path = "../../logger" }
 iroha_permissions_validators = { version = "=2.0.0-pre-rc.5", path = "../../permissions_validators" }