[feature] hyperledger-iroha#2050: Add role-related queries. (hyperled…

…ger-iroha#2126)

Signed-off-by: Aleksandr Petrosyan <[email protected]>

CHANGELOG.rst

@@ -171,7 +171,7 @@ Version bumps
 - Update docker publish target to ``hyperledger/iroha2``.
 - Updates the workflow to match ``main``.
 - Update API spec and fix health endpoint.
-- Update Rust to 1.54. 
+- Update Rust to 1.54.
 - Update ``ursa`` version from 0.3.5 to 0.3.6.
 - Update workflows to new runners.
 - Update dockerfile for caching and faster CI builds.
@@ -269,7 +269,7 @@ Other
 - 1451 Remove ``MAX_FAULTY_PEERS`` parameter.
 - Add handler for getting specific block hash.
 - Add new query FindTransactionByHash.
-- 1185 Rename the crate from ``iroha`` to ``iroha_core``, update the path. 
+- 1185 Rename the crate from ``iroha`` to ``iroha_core``, update the path.
 - Fix logs and general improvements.
 - 1150 Introduce ``KURA_BLOCKS_PER_STORAGE_FILE`` setting which defaults to 1000
   and defines the number of blocks per each new created datafile.
@@ -760,4 +760,3 @@ Other
 - Replace deprecated param ``max_rounds_delay`` with
   ``proposal_creation_timeout``.
   Update sample config file to have not deprecated DB connection params.
-

cli/src/torii/routing.rs

@@ -19,7 +19,10 @@ use iroha_core::{
     wsv::WorldTrait,
 };
 use iroha_crypto::SignatureOf;
-use iroha_data_model::{prelude::*, query};
+use iroha_data_model::{
+    prelude::*,
+    query::{self, SignedQueryRequest},
+};
 #[cfg(feature = "telemetry")]
 use iroha_telemetry::metrics::Status;
 use parity_scale_codec::{Decode, Encode};

client/src/client.rs

@@ -13,7 +13,7 @@ use eyre::{eyre, Result, WrapErr};
 use http_default::WebSocketStream;
 use iroha_config::{GetConfiguration, PostConfiguration};
 use iroha_crypto::{HashOf, KeyPair};
-use iroha_data_model::prelude::*;
+use iroha_data_model::{prelude::*, query::SignedQueryRequest};
 use iroha_logger::prelude::*;
 use iroha_telemetry::metrics::Status;
 use iroha_version::prelude::*;

core/src/smartcontracts/isi/asset.rs

@@ -343,7 +343,7 @@ pub mod isi {
 
 /// Asset-related query implementations.
 pub mod query {
-    use eyre::{Result, WrapErr};
+    use eyre::{Result, WrapErr as _};
     use iroha_logger::prelude::*;
 
     use super::*;

core/src/smartcontracts/isi/query.rs

@@ -122,8 +122,13 @@ impl<W: WorldTrait> ValidQuery<W> for QueryBox {
             FindTransactionByHash(query) => query.execute_into_value(wsv),
             FindPermissionTokensByAccountId(query) => query.execute_into_value(wsv),
             FindAssetDefinitionKeyValueByIdAndKey(query) => query.execute_into_value(wsv),
+            FindAllActiveTriggerIds(query) => query.execute_into_value(wsv),
+            FindTriggerById(query) => query.execute_into_value(wsv),
+            FindTriggerKeyValueByIdAndKey(query) => query.execute_into_value(wsv),
             FindAllRoles(query) => query.execute_into_value(wsv),
+            FindAllRoleIds(query) => query.execute_into_value(wsv),
             FindRolesByAccountId(query) => query.execute_into_value(wsv),
+            FindRoleByRoleId(query) => query.execute_into_value(wsv),
         }
     }
 }

core/src/smartcontracts/isi/triggers.rs

@@ -136,3 +136,61 @@ pub mod isi {
         }
     }
 }
+
+pub mod query {
+    //! Queries associated to triggers.
+    use iroha_logger::prelude::*;
+
+    use super::*;
+    use crate::{
+        prelude::*,
+        smartcontracts::{isi::prelude::WorldTrait, query::Error, Evaluate as _, FindError},
+    };
+
+    impl<W: WorldTrait> ValidQuery<W> for FindAllActiveTriggerIds {
+        #[log]
+        #[metrics(+"find_all_active_triggers")]
+        fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
+            Ok(wsv.world.triggers.clone().into())
+        }
+    }
+
+    impl<W: WorldTrait> ValidQuery<W> for FindTriggerById {
+        #[log]
+        #[metrics(+"find_trigger_by_id")]
+        fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
+            let id = self
+                .id
+                .evaluate(wsv, &Context::new())
+                .map_err(|e| Error::Evaluate(format!("Failed to evaluate trigger id. {}", e)))?;
+            let action = wsv.world.triggers.get(&id)?;
+
+            // TODO: Should we redact the metadata if the account is not the technical account/owner?
+            Ok(Trigger {
+                id,
+                action: action.clone(),
+            })
+        }
+    }
+
+    impl<W: WorldTrait> ValidQuery<W> for FindTriggerKeyValueByIdAndKey {
+        #[log]
+        #[metrics(+"find_trigger_key_value_by_id_and_key")]
+        fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
+            let id = self
+                .id
+                .evaluate(wsv, &Context::new())
+                .map_err(|e| Error::Evaluate(format!("Failed to evaluate trigger id. {}", e)))?;
+            let action = wsv.world.triggers.get(&id)?;
+            let key = self
+                .key
+                .evaluate(wsv, &Context::new())
+                .map_err(|e| Error::Evaluate(format!("Failed to evaluate key. {}", e)))?;
+            action
+                .metadata
+                .get(&key)
+                .map(Clone::clone)
+                .ok_or_else(|| FindError::MetadataKey(key).into())
+        }
+    }
+}

core/src/smartcontracts/isi/world.rs

@@ -1,13 +1,14 @@
 //! `World`-related ISI implementations.
 
+use iroha_telemetry::metrics;
+
 use super::prelude::*;
 use crate::prelude::*;
 
 /// Iroha Special Instructions that have `World` as their target.
 pub mod isi {
     use eyre::Result;
     use iroha_data_model::prelude::*;
-    use iroha_telemetry::metrics;
 
     use super::*;
 
@@ -202,6 +203,7 @@ pub mod query {
 
     impl<W: WorldTrait> ValidQuery<W> for FindAllRoles {
         #[log]
+        #[metrics(+"find_all_roles")]
         fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
             Ok(wsv
                 .world
@@ -212,8 +214,39 @@ pub mod query {
         }
     }
 
+    impl<W: WorldTrait> ValidQuery<W> for FindAllRoleIds {
+        #[log]
+        #[metrics(+"find_all_role_ids")]
+        fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
+            Ok(wsv
+               .world
+               .roles
+               .iter()
+               // To me, this should probably be a method, not a field.
+               .map(|role| role.id().clone())
+               .collect())
+        }
+    }
+
+    impl<W: WorldTrait> ValidQuery<W> for FindRoleByRoleId {
+        #[log]
+        #[metrics(+"find_role_by_role_id")]
+        fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
+            let role_id = self
+                .id
+                .evaluate(wsv, &Context::new())
+                .map_err(|e| Error::Evaluate(e.to_string()))?;
+
+            wsv.world.roles.get(&role_id).map_or_else(
+                || Err(Error::Find(Box::new(FindError::Role(role_id)))),
+                |role_ref| Ok(role_ref.clone()),
+            )
+        }
+    }
+
     impl<W: WorldTrait> ValidQuery<W> for FindAllPeers {
         #[log]
+        #[metrics("find_all_peers")]
         fn execute(&self, wsv: &WorldStateView<W>) -> Result<Self::Output, Error> {
             Ok(wsv.peers())
         }

core/src/triggers.rs

@@ -24,6 +24,14 @@ pub struct TriggerSet(
     DashMap<trigger::Id, Action>, // TODO: Consider tree structures.
 );
 
+impl From<TriggerSet> for Vec<trigger::Id> {
+    fn from(TriggerSet(map): TriggerSet) -> Self {
+        map.iter()
+            .map(|reference| reference.key().clone())
+            .collect()
+    }
+}
+
 impl TriggerSet {
     /// Add another trigger to the [`TriggerSet`].
     ///
@@ -46,13 +54,8 @@ impl TriggerSet {
     ///
     /// # Errors
     /// - If [`TriggerSet`] doesn't contain the trigger with the given `id`.
-    pub fn get(
-        &self,
-        id: &trigger::Id,
-    ) -> Result<impl Deref<Target = Action> + '_, smartcontracts::Error> {
-        self.0
-            .get(id)
-            .ok_or_else(|| smartcontracts::Error::Find(Box::new(FindError::Trigger(id.clone()))))
+    pub fn get(&self, id: &trigger::Id) -> Result<impl Deref<Target = Action> + '_, FindError> {
+        self.0.get(id).ok_or_else(|| FindError::Trigger(id.clone()))
     }
 
     /// Remove a trigger from the [`TriggerSet`].
@@ -76,6 +79,13 @@ impl TriggerSet {
         self.0.contains_key(key)
     }
 
+    /// Forward the internal immutable iterator.
+    pub fn iter(
+        &self,
+    ) -> dashmap::iter::Iter<iroha_data_model::trigger::Id, iroha_data_model::trigger::Action> {
+        self.0.iter()
+    }
+
     /// Modify repetitions of the hook identified by [`trigger::Id`].
     ///
     /// # Errors