feat!: unify executor data model

Co-authored-by: Marin Veršić <[email protected]> Co-authored-by: Nikita Strygin <[email protected]> Co-authored-by: Shanin Roman <[email protected]> Signed-off-by: Dmitry Balashov <[email protected]>
hyperledger-iroha · May 22, 2024 · 3a09ab6 · 3a09ab6
1 parent a9e0b4f
commit 3a09ab6
Show file tree

Hide file tree

Showing 61 changed files with 1,511 additions and 1,735 deletions.
diff --git a/client/benches/tps/utils.rs b/client/benches/tps/utils.rs
@@ -1,14 +1,7 @@
 use std::{fmt, fs::File, io::BufReader, path::Path, sync::mpsc, thread, time};
 
 use eyre::{Result, WrapErr};
-use iroha_client::{
-    client::Client,
-    crypto::KeyPair,
-    data_model::{
-        parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
-        prelude::*,
-    },
-};
+use iroha_client::{client::Client, crypto::KeyPair, data_model::prelude::*};
 use iroha_data_model::events::pipeline::{BlockEventFilter, BlockStatus};
 use nonzero_ext::nonzero;
 use serde::Deserialize;
@@ -51,16 +44,13 @@ impl Config {
 
     pub fn measure(self) -> Result<Tps> {
         // READY
-        let (_rt, network, client) = Network::start_test_with_runtime(self.peers, None);
+        let (_rt, network, _client) = Network::start_test_with_runtime(
+            NetworkOptions::with_n_peers(self.peers)
+                .with_max_txs_in_block(self.max_txs_per_block.try_into().unwrap()),
+        );
         let clients = network.clients();
         wait_for_genesis_committed_with_max_retries(&clients, 0, self.genesis_max_retries);
 
-        client.submit_all_blocking(
-            ParametersBuilder::new()
-                .add_parameter(MAX_TRANSACTIONS_IN_BLOCK, self.max_txs_per_block)?
-                .into_set_parameters(),
-        )?;
-
         let unit_names = (UnitName::MIN..).take(self.peers as usize);
         let units = clients
             .into_iter()

diff --git a/client/src/client.rs b/client/src/client.rs
@@ -328,7 +328,7 @@ impl_query_output! {
     crate::data_model::block::BlockHeader,
     crate::data_model::metadata::MetadataValueBox,
     crate::data_model::query::TransactionQueryOutput,
-    crate::data_model::permission::PermissionSchema,
+    crate::data_model::executor::ExecutorDataModel,
     crate::data_model::trigger::Trigger,
     crate::data_model::prelude::Numeric,
 }
@@ -1517,11 +1517,6 @@ pub mod permission {
     //! Module with queries for permission tokens
     use super::*;
 
-    /// Construct a query to get all registered [`PermissionDefinition`]s
-    pub const fn permission_schema() -> FindPermissionSchema {
-        FindPermissionSchema {}
-    }
-
     /// Construct a query to get all [`Permission`] granted
     /// to account with given [`Id`][AccountId]
     pub fn by_account_id(account_id: AccountId) -> FindPermissionsByAccountId {
@@ -1564,6 +1559,16 @@ pub mod parameter {
     }
 }
 
+pub mod executor {
+    //! Queries for executor entities
+    use super::*;
+
+    /// Retrieve executor data model
+    pub const fn data_model() -> FindExecutorDataModel {
+        FindExecutorDataModel
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::str::FromStr;

diff --git a/client/tests/integration/asset_propagation.rs b/client/tests/integration/asset_propagation.rs
@@ -3,12 +3,10 @@ use std::{str::FromStr as _, thread};
 use eyre::Result;
 use iroha_client::{
     client::{self, QueryResult},
-    data_model::{
-        parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
-        prelude::*,
-    },
+    data_model::prelude::*,
 };
 use iroha_config::parameters::actual::Root as Config;
+use nonzero_ext::nonzero;
 use test_network::*;
 use test_samples::gen_account_in;
 
@@ -18,16 +16,14 @@ use test_samples::gen_account_in;
 fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount_on_another_peer(
 ) -> Result<()> {
     // Given
-    let (_rt, network, client) = Network::start_test_with_runtime(4, Some(10_450));
+    let (_rt, network, client) = Network::start_test_with_runtime(
+        NetworkOptions::with_n_peers(4)
+            .with_start_port(10_450)
+            .with_max_txs_in_block(nonzero!(1u32)),
+    );
     wait_for_genesis_committed(&network.clients(), 0);
     let pipeline_time = Config::pipeline_time();
 
-    client.submit_all_blocking(
-        ParametersBuilder::new()
-            .add_parameter(MAX_TRANSACTIONS_IN_BLOCK, 1u32)?
-            .into_set_parameters(),
-    )?;
-
     let create_domain: InstructionBox =
         Register::domain(Domain::new(DomainId::from_str("domain")?)).into();
     let (account_id, _account_keypair) = gen_account_in("domain");

diff --git a/client/tests/integration/events/data.rs b/client/tests/integration/events/data.rs
@@ -240,13 +240,13 @@ fn produce_multiple_events() -> Result<()> {
         DataEvent::Domain(DomainEvent::Account(AccountEvent::PermissionAdded(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_1.definition_id.clone(),
+                permission_id: token_1.id.clone(),
             },
         ))),
         DataEvent::Domain(DomainEvent::Account(AccountEvent::PermissionAdded(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_2.definition_id.clone(),
+                permission_id: token_2.id.clone(),
             },
         ))),
         DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleGranted(
@@ -258,13 +258,13 @@ fn produce_multiple_events() -> Result<()> {
         DataEvent::Domain(DomainEvent::Account(AccountEvent::PermissionRemoved(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_1.definition_id,
+                permission_id: token_1.id,
             },
         ))),
         DataEvent::Domain(DomainEvent::Account(AccountEvent::PermissionRemoved(
             AccountPermissionChanged {
                 account_id: bob_id.clone(),
-                permission_id: token_2.definition_id,
+                permission_id: token_2.id,
             },
         ))),
         DataEvent::Domain(DomainEvent::Account(AccountEvent::RoleRevoked(

diff --git a/client/tests/integration/events/pipeline.rs b/client/tests/integration/events/pipeline.rs
@@ -1,13 +1,7 @@
 use std::thread::{self, JoinHandle};
 
 use eyre::Result;
-use iroha_client::{
-    crypto::HashOf,
-    data_model::{
-        parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
-        prelude::*,
-    },
-};
+use iroha_client::{crypto::HashOf, data_model::prelude::*};
 use iroha_config::parameters::actual::Root as Config;
 use iroha_data_model::{
     events::pipeline::{
@@ -17,6 +11,7 @@ use iroha_data_model::{
     transaction::error::TransactionRejectionReason,
     ValidationFail,
 };
+use nonzero_ext::nonzero;
 use test_network::*;
 
 // Needed to re-enable ignored tests.
@@ -49,18 +44,15 @@ fn test_with_instruction_and_status_and_port(
     should_be: &TransactionStatus,
     port: u16,
 ) -> Result<()> {
-    let (_rt, network, client) =
-        Network::start_test_with_runtime(PEER_COUNT.try_into().unwrap(), Some(port));
+    let (_rt, network, client) = Network::start_test_with_runtime(
+        NetworkOptions::with_n_peers(PEER_COUNT.try_into().unwrap())
+            .with_start_port(port)
+            .with_max_txs_in_block(nonzero!(1u32)),
+    );
     let clients = network.clients();
     wait_for_genesis_committed(&clients, 0);
     let pipeline_time = Config::pipeline_time();
 
-    client.submit_all_blocking(
-        ParametersBuilder::new()
-            .add_parameter(MAX_TRANSACTIONS_IN_BLOCK, 1u32)?
-            .into_set_parameters(),
-    )?;
-
     // Given
     let submitter = client;
     let transaction = submitter.build_transaction(instruction, UnlimitedMetadata::new());

diff --git a/client/tests/integration/extra_functional/connected_peers.rs b/client/tests/integration/extra_functional/connected_peers.rs
@@ -17,17 +17,18 @@ use tokio::runtime::Runtime;
 #[ignore = "ignore, more in #2851"]
 #[test]
 fn connected_peers_with_f_2_1_2() -> Result<()> {
-    connected_peers_with_f(2, Some(11_020))
+    connected_peers_with_f(2, 11_020)
 }
 
 #[test]
 fn connected_peers_with_f_1_0_1() -> Result<()> {
-    connected_peers_with_f(1, Some(11_000))
+    connected_peers_with_f(1, 11_000)
 }
 
 #[test]
 fn register_new_peer() -> Result<()> {
-    let (_rt, network, _) = Network::start_test_with_runtime(4, Some(11_180));
+    let (_rt, network, _) =
+        Network::start_test_with_runtime(NetworkOptions::with_n_peers(4).with_start_port(11_180));
     wait_for_genesis_committed(&network.clients(), 0);
     let pipeline_time = Config::pipeline_time();
 
@@ -65,14 +66,16 @@ fn register_new_peer() -> Result<()> {
 }
 
 /// Test the number of connected peers, changing the number of faults tolerated down and up
-fn connected_peers_with_f(faults: u64, start_port: Option<u16>) -> Result<()> {
+fn connected_peers_with_f(faults: u64, start_port: u16) -> Result<()> {
     let n_peers = 3 * faults + 1;
 
     let (_rt, network, _) = Network::start_test_with_runtime(
-        (n_peers)
-            .try_into()
-            .wrap_err("`faults` argument `u64` value too high, cannot convert to `u32`")?,
-        start_port,
+        NetworkOptions::with_n_peers(
+            (n_peers)
+                .try_into()
+                .wrap_err("`faults` argument `u64` value too high, cannot convert to `u32`")?,
+        )
+        .with_start_port(start_port),
     );
     wait_for_genesis_committed(&network.clients(), 0);
     let pipeline_time = Config::pipeline_time();

diff --git a/client/tests/integration/extra_functional/multiple_blocks_created.rs b/client/tests/integration/extra_functional/multiple_blocks_created.rs
@@ -3,12 +3,10 @@ use std::thread;
 use eyre::Result;
 use iroha_client::{
     client::{self, Client, QueryResult},
-    data_model::{
-        parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
-        prelude::*,
-    },
+    data_model::prelude::*,
 };
 use iroha_config::parameters::actual::Root as Config;
+use nonzero_ext::nonzero;
 use test_network::*;
 use test_samples::gen_account_in;
 
@@ -18,16 +16,14 @@ const N_BLOCKS: usize = 510;
 #[test]
 fn long_multiple_blocks_created() -> Result<()> {
     // Given
-    let (_rt, network, client) = Network::start_test_with_runtime(4, Some(10_965));
+    let (_rt, network, client) = Network::start_test_with_runtime(
+        NetworkOptions::with_n_peers(4)
+            .with_start_port(10_965)
+            .with_max_txs_in_block(nonzero!(1u32)),
+    );
     wait_for_genesis_committed(&network.clients(), 0);
     let pipeline_time = Config::pipeline_time();
 
-    client.submit_all_blocking(
-        ParametersBuilder::new()
-            .add_parameter(MAX_TRANSACTIONS_IN_BLOCK, 1u32)?
-            .into_set_parameters(),
-    )?;
-
     let create_domain: InstructionBox = Register::domain(Domain::new("domain".parse()?)).into();
     let (account_id, _account_keypair) = gen_account_in("domain");
     let create_account = Register::account(Account::new(account_id.clone())).into();

diff --git a/client/tests/integration/extra_functional/offline_peers.rs b/client/tests/integration/extra_functional/offline_peers.rs
@@ -18,10 +18,10 @@ fn genesis_block_is_committed_with_some_offline_peers() -> Result<()> {
     // Given
     let rt = Runtime::test();
 
-    let (network, client) = rt.block_on(Network::start_test_with_offline_and_set_n_shifts(
-        4,
-        1,
-        Some(10_560),
+    let (network, client) = rt.block_on(Network::start_test(
+        NetworkOptions::with_n_peers(4)
+            .with_offline_peers(1)
+            .with_start_port(10_560),
     ));
     wait_for_genesis_committed(&network.clients(), 1);
 
@@ -44,9 +44,8 @@ fn genesis_block_is_committed_with_some_offline_peers() -> Result<()> {
 
 #[test]
 fn register_offline_peer() -> Result<()> {
-    let n_peers = 4;
-
-    let (_rt, network, client) = Network::start_test_with_runtime(n_peers, Some(11_160));
+    let (_rt, network, client) =
+        Network::start_test_with_runtime(NetworkOptions::with_n_peers(4).with_start_port(11_160));
     wait_for_genesis_committed(&network.clients(), 0);
     let pipeline_time = Config::pipeline_time();
     let peer_clients = Network::clients(&network);

diff --git a/client/tests/integration/extra_functional/restart_peer.rs b/client/tests/integration/extra_functional/restart_peer.rs
@@ -20,7 +20,9 @@ fn restarted_peer_should_have_the_same_asset_amount() -> Result<()> {
     let mut removed_peer = {
         let n_peers = 4;
 
-        let (_rt, network, _) = Network::start_test_with_runtime(n_peers, Some(11_205));
+        let (_rt, network, _) = Network::start_test_with_runtime(
+            NetworkOptions::with_n_peers(n_peers).with_start_port(11_205),
+        );
         wait_for_genesis_committed(&network.clients(), 0);
         let pipeline_time = Config::pipeline_time();
         let peer_clients = Network::clients(&network);

diff --git a/client/tests/integration/extra_functional/unregister_peer.rs b/client/tests/integration/extra_functional/unregister_peer.rs
@@ -3,12 +3,10 @@ use std::thread;
 use eyre::Result;
 use iroha_client::{
     client::{self, QueryResult},
-    data_model::{
-        parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
-        prelude::*,
-    },
+    data_model::prelude::*,
 };
 use iroha_config::parameters::actual::Root as Config;
+use nonzero_ext::nonzero;
 use test_network::*;
 use test_samples::gen_account_in;
 
@@ -114,24 +112,25 @@ fn init() -> Result<(
     AccountId,
     AssetDefinitionId,
 )> {
-    let (rt, network, client) = Network::start_test_with_runtime(4, Some(10_925));
+    let (rt, network, client) = Network::start_test_with_runtime(
+        NetworkOptions::with_n_peers(4)
+            .with_start_port(10_925)
+            .with_max_txs_in_block(nonzero!(1u32)),
+    );
     let pipeline_time = Config::pipeline_time();
     iroha_logger::info!("Started");
-    let parameters = ParametersBuilder::new()
-        .add_parameter(MAX_TRANSACTIONS_IN_BLOCK, 1u32)?
-        .into_set_parameters();
     let create_domain = Register::domain(Domain::new("domain".parse()?));
     let (account_id, _account_keypair) = gen_account_in("domain");
     let create_account = Register::account(Account::new(account_id.clone()));
     let asset_definition_id: AssetDefinitionId = "xor#domain".parse()?;
     let create_asset =
         Register::asset_definition(AssetDefinition::numeric(asset_definition_id.clone()));
-    let instructions = parameters.into_iter().chain([
+    let isi: [InstructionBox; 3] = [
         create_domain.into(),
         create_account.into(),
         create_asset.into(),
-    ]);
-    client.submit_all_blocking(instructions)?;
+    ];
+    client.submit_all_blocking(isi)?;
     iroha_logger::info!("Init");
     Ok((
         rt,

diff --git a/client/tests/integration/extra_functional/unstable_network.rs b/client/tests/integration/extra_functional/unstable_network.rs
@@ -61,11 +61,16 @@ fn unstable_network(
         {
             configuration.sumeragi.debug_force_soft_fork = force_soft_fork;
         }
-        let network = Network::new_with_offline_peers(
-            Some(configuration),
-            n_peers + n_offline_peers,
-            0,
-            Some(port),
+        let network = Network::new(
+            NetworkOptions::with_n_peers(n_peers + n_offline_peers)
+                .with_start_port(port)
+                .with_max_txs_in_block(MAX_TRANSACTIONS_IN_BLOCK.try_into().unwrap())
+                .with_config_mut(|cfg| {
+                    #[cfg(debug_assertions)]
+                    {
+                        cfg.sumeragi.debug_force_soft_fork = force_soft_fork;
+                    }
+                }),
         )
         .await
         .expect("Failed to init peers");

diff --git a/client/tests/integration/mod.rs b/client/tests/integration/mod.rs
@@ -6,10 +6,10 @@ mod events;
 mod extra_functional;
 mod non_mintable;
 mod pagination;
+mod parameters;
 mod permissions;
 mod queries;
 mod roles;
-mod set_parameter;
 mod sorting;
 mod status_response;
 mod transfer_asset;