move merkle tree to data_model

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

core/src/block.rs

@@ -8,14 +8,15 @@ use std::{collections::BTreeSet, iter, marker::PhantomData};
 use dashmap::{mapref::one::Ref as MapRef, DashMap};
 use eyre::{Context, Result};
 use iroha_crypto::{HashOf, KeyPair, SignatureOf, SignaturesOf};
-use iroha_data_model::{current_time, events::prelude::*, transaction::prelude::*};
+use iroha_data_model::{
+    current_time, events::prelude::*, merkle::MerkleTree, transaction::prelude::*,
+};
 use iroha_derive::Io;
 use iroha_schema::IntoSchema;
 use iroha_version::{declare_versioned_with_scale, version_with_scale};
 use parity_scale_codec::{Decode, Encode};
 
 use crate::{
-    merkle::MerkleTree,
     prelude::*,
     smartcontracts::permissions::{IsInstructionAllowedBoxed, IsQueryAllowedBoxed},
     sumeragi::{

core/src/kura.rs

@@ -15,6 +15,7 @@ use async_trait::async_trait;
 use futures::{Stream, StreamExt, TryStreamExt};
 use iroha_actor::{broker::*, prelude::*};
 use iroha_crypto::HashOf;
+use iroha_data_model::merkle::MerkleTree;
 use iroha_version::scale::{DecodeVersioned, EncodeVersioned};
 use pin_project::pin_project;
 use serde::{Deserialize, Serialize};
@@ -27,7 +28,6 @@ use tokio_stream::wrappers::ReadDirStream;
 use crate::{
     block::VersionedCommittedBlock,
     block_sync::ContinueSync,
-    merkle::MerkleTree,
     prelude::*,
     sumeragi::{self, UpdateNetworkTopology},
     wsv::WorldTrait,
@@ -243,14 +243,14 @@ impl<W: WorldTrait, IO: DiskIO> KuraWithIO<W, IO> {
         block: VersionedCommittedBlock,
     ) -> Result<HashOf<VersionedCommittedBlock>> {
         match self.block_store.write(&block).await {
-            Ok(hash) => {
-                self.merkle_tree = self.merkle_tree.add(hash);
+            Ok(block_hash) => {
+                self.merkle_tree = self.merkle_tree.add(block_hash);
                 if let Err(error) = self.wsv.apply(block).await {
-                    iroha_logger::warn!(%error, "Failed to execute transaction on WSV");
+                    iroha_logger::warn!(%error, %block_hash, "Failed to apply block on WSV");
                 }
                 self.broker.issue_send(UpdateNetworkTopology).await;
                 self.broker.issue_send(ContinueSync).await;
-                Ok(hash)
+                Ok(block_hash)
             }
             Err(error) => {
                 let blocks = self

core/src/lib.rs

@@ -7,7 +7,6 @@ pub mod event;
 pub mod genesis;
 mod init;
 pub mod kura;
-mod merkle;
 pub mod modules;
 pub mod queue;
 pub mod samples;
@@ -29,7 +28,6 @@ use smartcontracts::permissions::{IsInstructionAllowedBoxed, IsQueryAllowedBoxed
 use tokio::{sync::broadcast, task::JoinHandle};
 
 use crate::{
-    block::VersionedValidBlock,
     block_sync::{
         message::VersionedMessage as BlockSyncMessage, BlockSynchronizer, BlockSynchronizerTrait,
     },

core/src/queue.rs

@@ -6,7 +6,7 @@ use crossbeam_queue::ArrayQueue;
 use dashmap::{mapref::entry::Entry, DashMap};
 use eyre::{Report, Result};
 use iroha_crypto::HashOf;
-use iroha_data_model::transaction::VersionedTransaction;
+use iroha_data_model::prelude::*;
 use thiserror::Error;
 
 pub use self::config::Configuration;

core/src/sumeragi/mod.rs

@@ -12,11 +12,9 @@ use std::{
 use dashmap::{DashMap, DashSet};
 use eyre::{eyre, Result};
 use futures::{prelude::*, stream::FuturesUnordered};
-use iroha_actor::{broker::*, prelude::*};
+use iroha_actor::{broker::*, prelude::*, Context};
 use iroha_crypto::{HashOf, KeyPair};
-use iroha_data_model::{
-    current_time, events::Event, peer::Id as PeerId, transaction::VersionedTransaction,
-};
+use iroha_data_model::prelude::*;
 use iroha_logger::Instrument;
 use iroha_p2p::{ConnectPeer, DisconnectPeer};
 use network_topology::{Role, Topology};

core/src/tx.rs

@@ -5,7 +5,7 @@
 use std::{cmp::min, time::Duration};
 
 use eyre::{Result, WrapErr};
-use iroha_crypto::{HashOf, SignaturesOf};
+use iroha_crypto::SignaturesOf;
 pub use iroha_data_model::prelude::*;
 use iroha_derive::Io;
 use iroha_version::{declare_versioned_with_scale, version_with_scale};
@@ -54,11 +54,6 @@ impl VersionedAcceptedTransaction {
         AcceptedTransaction::from_transaction(transaction, max_instruction_number).map(Into::into)
     }
 
-    /// Calculate transaction `Hash`.
-    pub fn hash(&self) -> HashOf<VersionedTransaction> {
-        self.as_inner_v1().hash().transmute()
-    }
-
     /// Checks if this transaction is waiting longer than specified in `transaction_time_to_live` from `QueueConfiguration` or `time_to_live_ms` of this transaction.
     /// Meaning that the transaction will be expired as soon as the lesser of the specified TTLs was reached.
     pub fn is_expired(&self, transaction_time_to_live: Duration) -> bool {
@@ -104,16 +99,13 @@ impl VersionedAcceptedTransaction {
     ) -> VersionedRejectedTransaction {
         self.into_inner_v1().reject(rejection_reason).into()
     }
+}
 
-    /// # Errors
-    /// Asserts specific instruction number of instruction in transaction constraint
-    pub fn check_instruction_len(&self, max_instruction_len: u64) -> Result<()> {
-        self.as_inner_v1()
-            .check_instruction_len(max_instruction_len)
-    }
+impl Txn for VersionedAcceptedTransaction {
+    type HashOf = VersionedTransaction;
 
-    /// Returns payload of transaction
-    pub const fn payload(&self) -> &Payload {
+    #[inline]
+    fn payload(&self) -> &Payload {
         &self.as_inner_v1().payload
     }
 }
@@ -134,12 +126,6 @@ pub struct AcceptedTransaction {
 }
 
 impl AcceptedTransaction {
-    /// # Errors
-    /// Asserts specific instruction number of instruction in transaction constraint
-    pub fn check_instruction_len(&self, max_instruction_len: u64) -> Result<()> {
-        self.payload.check_instruction_len(max_instruction_len)
-    }
-
     /// Accepts transaction
     ///
     /// # Errors
@@ -160,11 +146,6 @@ impl AcceptedTransaction {
         })
     }
 
-    /// Calculate transaction `Hash`.
-    pub fn hash(&self) -> HashOf<Transaction> {
-        HashOf::new(&self.payload).transmute()
-    }
-
     /// Checks if this transaction is waiting longer than specified in `transaction_time_to_live` from `QueueConfiguration` or `time_to_live_ms` of this transaction.
     /// Meaning that the transaction will be expired as soon as the lesser of the specified TTLs was reached.
     pub fn is_expired(&self, transaction_time_to_live: Duration) -> bool {
@@ -311,6 +292,14 @@ impl AcceptedTransaction {
         }
     }
 }
+impl Txn for AcceptedTransaction {
+    type HashOf = Transaction;
+
+    #[inline]
+    fn payload(&self) -> &Payload {
+        &self.payload
+    }
+}
 
 impl IsInBlockchain for VersionedAcceptedTransaction {
     #[inline]

core/src/wsv.rs

@@ -8,8 +8,6 @@ use std::{
 };
 
 use config::Configuration;
-#[cfg(feature = "roles")]
-use dashmap::DashMap;
 use dashmap::{
     mapref::one::{Ref as DashmapRef, RefMut as DashmapRefMut},
     DashSet,