[refactor]: remove signatures from blocks

client/src/client.rs

@@ -28,7 +28,7 @@ use crate::{
     config::Config,
     crypto::{HashOf, KeyPair},
     data_model::{
-        block::SignedBlock,
+        block::Block,
         isi::Instruction,
         prelude::*,
         query::{predicate::PredicateBox, Pagination, Query, Sorting},
@@ -950,7 +950,7 @@ impl Client {
     pub fn listen_for_blocks(
         &self,
         height: NonZeroU64,
-    ) -> Result<impl Iterator<Item = Result<SignedBlock>>> {
+    ) -> Result<impl Iterator<Item = Result<Block>>> {
         blocks_api::BlockIterator::new(self.blocks_handler(height)?)
     }
 
@@ -1363,7 +1363,7 @@ mod blocks_api {
         pub struct Events;
 
         impl FlowEvents for Events {
-            type Event = crate::data_model::block::SignedBlock;
+            type Event = crate::data_model::block::Block;
 
             fn message(&self, message: Vec<u8>) -> Result<Self::Event> {
                 Ok(BlockMessage::decode_all(&mut message.as_slice()).map(Into::into)?)
@@ -1444,7 +1444,7 @@ pub mod block {
     }
 
     /// Construct a query to find block header by hash
-    pub fn header_by_hash(hash: HashOf<SignedBlock>) -> FindBlockHeaderByHash {
+    pub fn header_by_hash(hash: HashOf<Block>) -> FindBlockHeaderByHash {
         FindBlockHeaderByHash::new(hash)
     }
 }

client/tests/integration/triggers/time_trigger.rs

@@ -5,7 +5,7 @@ use iroha_client::{
     client::{self, Client, QueryResult},
     data_model::{prelude::*, transaction::WasmSmartContract},
 };
-use iroha_config::parameters::defaults::chain_wide::DEFAULT_CONSENSUS_ESTIMATION;
+use iroha_config::parameters::defaults::chain_wide::{DEFAULT_BLOCK_TIME, DEFAULT_COMMIT_TIME};
 use iroha_logger::info;
 use test_network::*;
 
@@ -19,6 +19,16 @@ macro_rules! const_assert {
     };
 }
 
+/// Default estimation of consensus duration.
+const DEFAULT_CONSENSUS_ESTIMATION: Duration =
+    match DEFAULT_BLOCK_TIME.checked_add(match DEFAULT_COMMIT_TIME.checked_div(2) {
+        Some(x) => x,
+        None => unreachable!(),
+    }) {
+        Some(x) => x,
+        None => unreachable!(),
+    };
+
 /// Time-based triggers and block commitment process depend heavily on **current time** and **CPU**,
 /// so it's impossible to create fully reproducible test scenario.
 ///

config/src/parameters/defaults.rs

@@ -61,16 +61,6 @@ pub mod chain_wide {
     // TODO: wrap into a `Bytes` newtype
     pub const DEFAULT_WASM_MAX_MEMORY_BYTES: u32 = 500 * 2_u32.pow(20);
 
-    /// Default estimation of consensus duration.
-    pub const DEFAULT_CONSENSUS_ESTIMATION: Duration =
-        match DEFAULT_BLOCK_TIME.checked_add(match DEFAULT_COMMIT_TIME.checked_div(2) {
-            Some(x) => x,
-            None => unreachable!(),
-        }) {
-            Some(x) => x,
-            None => unreachable!(),
-        };
-
     /// Default limits for metadata
     pub const DEFAULT_METADATA_LIMITS: MetadataLimits =
         MetadataLimits::new(2_u32.pow(20), 2_u32.pow(12));