[refactor]: #3268 Rename item identifiers so that they are globally unique

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>

Author: mversic

actor/src/lib.rs

@@ -4,8 +4,6 @@
     clippy::expect_used,
     clippy::same_name_method
 )]
-#[cfg(feature = "deadlock_detection")]
-use core::any::type_name;
 use core::{
     fmt::Debug,
     ops::{Deref, DerefMut},
@@ -85,7 +83,7 @@ impl<A: Actor> Addr<A> {
         Self {
             sender,
             #[cfg(feature = "deadlock_detection")]
-            actor_id: ActorId::new(Some(type_name::<A>())),
+            actor_id: ActorId::new(Some(core::any::type_name::<A>())),
         }
     }
 
@@ -432,7 +430,7 @@ impl<A: Actor> InitializedActor<A> {
                     }
                 }
             }
-            iroha_logger::error!(actor = %std::any::type_name::<A>(), "Actor stopped");
+            iroha_logger::error!(actor = %core::any::type_name::<A>(), "Actor stopped");
             actor.on_stop(&mut ctx).await;
         }
         .in_current_span();

cli/src/samples.rs

@@ -8,7 +8,7 @@ use iroha_config::{
     torii::{uri::DEFAULT_API_URL, DEFAULT_TORII_P2P_ADDR, DEFAULT_TORII_TELEMETRY_URL},
 };
 use iroha_crypto::{KeyPair, PublicKey};
-use iroha_data_model::peer::Id as PeerId;
+use iroha_data_model::peer::PeerId;
 
 /// Get sample trusted peers. The public key must be the same as `configuration.public_key`
 ///

cli/src/torii/routing.rs

@@ -1,6 +1,6 @@
 //! Routing functions for Torii. If you want to add an endpoint to
 //! Iroha you should add it here by creating a `handle_*` function,
-//! and add it to impl Torii. This module also defines the `VerifiedQueryRequest`,
+//! and add it to impl Torii. This module also defines the `VerifiedQuery`,
 //! which is the only kind of query that is permitted to execute.
 
 // FIXME: This can't be fixed, because one trait in `warp` is private.
@@ -47,15 +47,15 @@ pub fn sorting() -> impl warp::Filter<Extract = (Sorting,), Error = warp::Reject
 
 /// Query Request verified on the Iroha node side.
 #[derive(Debug, Decode, Encode)]
-pub struct VerifiedQueryRequest {
+pub struct VerifiedQuery {
     /// Payload, containing the time, the query, the authenticating
     /// user account and a filter
-    payload: query::http::Payload,
+    payload: query::http::QueryPayload,
     /// Signature of the authenticating user
-    signature: SignatureOf<query::http::Payload>,
+    signature: SignatureOf<query::http::QueryPayload>,
 }
 
-impl VerifiedQueryRequest {
+impl VerifiedQuery {
     /// Validate query.
     ///
     /// # Errors
@@ -84,10 +84,10 @@ impl VerifiedQueryRequest {
     }
 }
 
-impl TryFrom<SignedQueryRequest> for VerifiedQueryRequest {
+impl TryFrom<SignedQuery> for VerifiedQuery {
     type Error = QueryExecutionFailure;
 
-    fn try_from(query: SignedQueryRequest) -> Result<Self, Self::Error> {
+    fn try_from(query: SignedQuery) -> Result<Self, Self::Error> {
         query
             .signature
             .verify(&query.payload)
@@ -131,10 +131,10 @@ pub(crate) async fn handle_queries(
     sumeragi: Arc<Sumeragi>,
     pagination: Pagination,
     sorting: Sorting,
-    request: VersionedSignedQueryRequest,
+    request: VersionedSignedQuery,
 ) -> Result<Scale<VersionedPaginatedQueryResult>> {
-    let VersionedSignedQueryRequest::V1(request) = request;
-    let request: VerifiedQueryRequest = request.try_into()?;
+    let VersionedSignedQuery::V1(request) = request;
+    let request: VerifiedQuery = request.try_into()?;
 
     let (result, filter) = {
         let wsv = sumeragi.wsv_mutex_access().clone();

client/benches/tps/utils.rs

@@ -173,7 +173,7 @@ impl MeasurerUnit {
             .with_params([("asset_id".parse()?, asset_id.clone().into())]);
         let allow_alice_to_transfer_my_asset =
             GrantBox::new(can_transfer_my_asset, alice_id).into();
-        let grant_tx = Transaction::new(
+        let grant_tx = TransactionBuilder::new(
             account_id,
             vec![
                 allow_alice_to_burn_my_asset,
@@ -222,15 +222,15 @@ impl MeasurerUnit {
         let submitter = self.client.clone();
         let interval_us_per_tx = self.config.interval_us_per_tx;
         let instructions = self.instructions();
-        let alice_id = <Account as Identifiable>::Id::from_str("alice@wonderland")
-            .expect("Failed to parse account id");
+        let account_id = account_id(self.name);
+
         let mut nonce = 0;
         thread::spawn(move || {
             for instruction in instructions {
                 match shutdown_signal.try_recv() {
                     Err(mpsc::TryRecvError::Empty) => {
                         let transaction =
-                            Transaction::new(alice_id.clone(), [instruction], u64::MAX)
+                            TransactionBuilder::new(account_id.clone(), [instruction], u64::MAX)
                                 .with_nonce(nonce); // Use nonce to avoid transaction duplication within the same thread
                         let transaction = submitter
                             .sign_transaction(transaction)
@@ -270,7 +270,7 @@ impl MeasurerUnit {
         let supply_roses = MintBox::new(100_u32.to_value(), asset_id(self.name));
         let burn_a_rose = BurnBox::new(1_u32.to_value(), asset_id(self.name));
 
-        IfInstruction::with_otherwise(is_running_out, supply_roses, burn_a_rose).into()
+        Conditional::with_otherwise(is_running_out, supply_roses, burn_a_rose).into()
     }
 
     fn relay_a_rose(&self) -> Instruction {
@@ -289,7 +289,7 @@ impl MeasurerUnit {
             asset_id(self.next_name),
         );
 
-        IfInstruction::new(enough_to_transfer, transfer_rose).into()
+        Conditional::new(enough_to_transfer, transfer_rose).into()
     }
 }
 

client/examples/tutorial.rs

@@ -93,16 +93,13 @@ fn domain_registration_test(config: &Configuration) -> Result<(), Error> {
 
 fn account_definition_test() -> Result<(), Error> {
     // #region account_definition_comparison
-    use iroha_data_model::{account::Id as AccountIdStruct, prelude::AccountId};
+    use iroha_data_model::prelude::AccountId;
 
-    // Create an `iroha_data_model::account::Id` instance
+    // Create an `iroha_data_model::AccountId` instance
     // with a DomainId instance and a Domain ID for an account
-    let longhand_account_id = AccountIdStruct {
-        name: "white_rabbit".parse()?,
-        domain_id: "looking_glass".parse()?,
-    };
+    let longhand_account_id = AccountId::new("white_rabbit".parse()?, "looking_glass".parse()?);
     let account_id: AccountId = "white_rabbit@looking_glass"
-        .parse::<AccountIdStruct>()
+        .parse()
         .expect("Valid, because the string contains no whitespace, has a single '@' character and is not empty after");
 
     // Check that two ways to define an account match
@@ -119,7 +116,6 @@ fn account_registration_test(config: &Configuration) -> Result<(), Error> {
     use iroha_client::client::Client;
     use iroha_crypto::KeyPair;
     use iroha_data_model::{
-        account::Id as AccountIdStruct,
         metadata::UnlimitedMetadata,
         prelude::{Account, AccountId, Instruction, RegisterBox},
     };
@@ -129,10 +125,9 @@ fn account_registration_test(config: &Configuration) -> Result<(), Error> {
     let iroha_client: Client = Client::new(&config)?;
 
     // #region register_account_create
-    // Create an AccountId instance by providing
-    // the account and domain name
+    // Create an AccountId instance by providing the account and domain name
     let account_id: AccountId = "white_rabbit@looking_glass"
-        .parse::<AccountIdStruct>()
+        .parse()
         .expect("Valid, because the string contains no whitespace, has a single '@' character and is not empty after");
     // #endregion register_account_create
 
@@ -169,11 +164,8 @@ fn asset_registration_test(config: &Configuration) -> Result<(), Error> {
     use std::str::FromStr as _;
 
     use iroha_client::client::Client;
-    use iroha_data_model::{
-        account::Id as AccountIdStruct,
-        prelude::{
-            AccountId, AssetDefinition, AssetDefinitionId, AssetId, IdBox, MintBox, RegisterBox,
-        },
+    use iroha_data_model::prelude::{
+        AccountId, AssetDefinition, AssetDefinitionId, AssetId, IdBox, MintBox, RegisterBox,
     };
     // #endregion register_asset_crates
 
@@ -197,7 +189,7 @@ fn asset_registration_test(config: &Configuration) -> Result<(), Error> {
 
     // Create an account using the previously defined asset
     let account_id: AccountId = "white_rabbit@looking_glass"
-        .parse::<AccountIdStruct>()
+        .parse()
         .expect("Valid, because the string contains no whitespace, has a single '@' character and is not empty after");
 
     // #region register_asset_mint_submit

client/src/client.rs

@@ -15,7 +15,7 @@ use iroha_config::{client::Configuration, torii::uri, GetConfiguration, PostConf
 use iroha_crypto::{HashOf, KeyPair};
 use iroha_data_model::{
     block::VersionedCommittedBlock, predicate::PredicateBox, prelude::*,
-    query::error::QueryExecutionFailure, transaction::Payload,
+    query::error::QueryExecutionFailure, transaction::TransactionPayload,
 };
 use iroha_logger::prelude::*;
 use iroha_primitives::small::SmallStr;
@@ -329,7 +329,7 @@ impl Client {
         instructions: impl Into<Executable>,
         metadata: UnlimitedMetadata,
     ) -> Result<SignedTransaction> {
-        let transaction = Transaction::new(
+        let transaction = TransactionBuilder::new(
             self.account_id.clone(),
             instructions,
             self.proposed_transaction_ttl_ms,
@@ -343,7 +343,9 @@ impl Client {
         }
         .with_metadata(metadata);
 
-        self.sign_transaction(transaction_with_metadata)
+        transaction_with_metadata
+            .sign(self.key_pair.clone())
+            .wrap_err("Failed to sign transaction")
     }
 
     /// Signs transaction
@@ -360,7 +362,7 @@ impl Client {
     ///
     /// # Errors
     /// Fails if signature generation fails
-    pub fn sign_query(&self, query: QueryRequest) -> Result<SignedQueryRequest> {
+    pub fn sign_query(&self, query: QueryBuilder) -> Result<SignedQuery> {
         query
             .sign(self.key_pair.clone())
             .wrap_err("Failed to sign query")
@@ -392,7 +394,7 @@ impl Client {
     }
 
     /// Instructions API entry point. Submits one Iroha Special Instruction to `Iroha` peers.
-    /// Allows to specify [`Metadata`] of [`Transaction`].
+    /// Allows to specify [`Metadata`] of [`TransactionBuilder`].
     /// Returns submitted transaction's hash or error string.
     ///
     /// # Errors
@@ -406,7 +408,7 @@ impl Client {
     }
 
     /// Instructions API entry point. Submits several Iroha Special Instructions to `Iroha` peers.
-    /// Allows to specify [`Metadata`] of [`Transaction`].
+    /// Allows to specify [`Metadata`] of [`TransactionBuilder`].
     /// Returns submitted transaction's hash or error string.
     ///
     /// # Errors
@@ -591,7 +593,7 @@ impl Client {
     }
 
     /// Submits and waits until the transaction is either rejected or committed.
-    /// Allows to specify [`Metadata`] of [`Transaction`].
+    /// Allows to specify [`Metadata`] of [`TransactionBuilder`].
     /// Returns rejection reason if transaction was rejected.
     ///
     /// # Errors
@@ -605,7 +607,7 @@ impl Client {
     }
 
     /// Submits and waits until the transaction is either rejected or committed.
-    /// Allows to specify [`Metadata`] of [`Transaction`].
+    /// Allows to specify [`Metadata`] of [`TransactionBuilder`].
     /// Returns rejection reason if transaction was rejected.
     ///
     /// # Errors
@@ -693,8 +695,8 @@ impl Client {
     {
         let pagination: Vec<_> = pagination.into();
         let sorting: Vec<_> = sorting.into();
-        let request = QueryRequest::new(request.into(), self.account_id.clone(), filter);
-        let request: VersionedSignedQueryRequest = self.sign_query(request)?.into();
+        let request = QueryBuilder::new(request.into(), self.account_id.clone(), filter);
+        let request: VersionedSignedQuery = self.sign_query(request)?.into();
 
         Ok((
             B::new(
@@ -939,7 +941,10 @@ impl Client {
     }
 
     /// Check if two transactions are the same. Compare their contents excluding the creation time.
-    fn equals_excluding_creation_time(first: &Payload, second: &Payload) -> bool {
+    fn equals_excluding_creation_time(
+        first: &TransactionPayload,
+        second: &TransactionPayload,
+    ) -> bool {
         first.account_id() == second.account_id()
             && first.instructions() == second.instructions()
             && first.time_to_live_ms() == second.time_to_live_ms()

client/tests/integration/events/data.rs

@@ -31,7 +31,7 @@ fn produce_instructions() -> Vec<Instruction> {
         registers[0].clone(),
         Pair::new::<Instruction, _>(
             registers[1].clone(),
-            IfInstruction::with_otherwise(
+            Conditional::with_otherwise(
                 false,
                 FailBox::new("unreachable"),
                 SequenceBox::new(vec![registers[2].clone(), registers[3].clone()]),

client/tests/integration/permissions/mod.rs

@@ -229,7 +229,7 @@ fn permissions_differ_not_only_by_names() {
     )
     .into();
 
-    let grant_hats_access_tx = Transaction::new(
+    let grant_hats_access_tx = TransactionBuilder::new(
         mouse_id.clone(),
         vec![allow_alice_to_set_key_value_in_hats],
         100_000,
@@ -268,7 +268,7 @@ fn permissions_differ_not_only_by_names() {
     )
     .into();
 
-    let grant_shoes_access_tx = Transaction::new(
+    let grant_shoes_access_tx = TransactionBuilder::new(
         mouse_id,
         vec![allow_alice_to_set_key_value_in_shoes],
         100_000,

client/tests/integration/permissions/runtime_validators.rs

@@ -35,7 +35,7 @@ fn deny_new_validators() -> Result<()> {
 
     let validator = Validator::new(
         "deny_new_validators%alice@wonderland".parse().unwrap(),
-        validator::Type::Instruction,
+        validator::ValidatorType::Instruction,
         WasmSmartContract::new(wasm.clone()),
     );
     info!("Submitting registration of the validator (should pass)");
@@ -44,7 +44,7 @@ fn deny_new_validators() -> Result<()> {
     // Trying to register the validator again
     let validator_2 = Validator::new(
         "deny_new_validators_2%alice@wonderland".parse().unwrap(),
-        validator::Type::Instruction,
+        validator::ValidatorType::Instruction,
         WasmSmartContract::new(wasm),
     );
     info!("Submitting registration of a new validator (should fail)");

client/tests/integration/roles.rs

@@ -74,7 +74,7 @@ fn register_and_grant_role_for_metadata_access() -> Result<()> {
 
     // Mouse grants role to Alice
     let grant_role = GrantBox::new(role_id.clone(), alice_id.clone());
-    let grant_role_tx = Transaction::new(mouse_id.clone(), vec![grant_role.into()], 100_000)
+    let grant_role_tx = TransactionBuilder::new(mouse_id.clone(), vec![grant_role.into()], 100_000)
         .sign(mouse_key_pair)?;
     test_client.submit_transaction_blocking(grant_role_tx)?;