[refactor] hyperledger#4378: Transactional trigger set

Signed-off-by: Shanin Roman <shanin1000@yandex.ru>
Erigara · Apr 22, 2024 · bbcffc0 · bbcffc0
1 parent 7cec705
commit bbcffc0
Show file tree

Hide file tree

Showing 5 changed files with 575 additions and 374 deletions.
diff --git a/core/src/smartcontracts/isi/mod.rs b/core/src/smartcontracts/isi/mod.rs
@@ -21,6 +21,7 @@ use storage::storage::StorageReadOnly;
 use super::Execute;
 use crate::{
     prelude::*,
+    smartcontracts::triggers::set::SetReadOnly,
     state::{StateReadOnly, StateTransaction, WorldReadOnly},
 };
 

diff --git a/core/src/smartcontracts/isi/triggers/mod.rs b/core/src/smartcontracts/isi/triggers/mod.rs
@@ -96,7 +96,7 @@ pub mod isi {
             let trigger_id = self.object_id.clone();
 
             let triggers = &mut state_transaction.world.triggers;
-            if triggers.remove(&trigger_id) {
+            if triggers.remove(trigger_id.clone()) {
                 state_transaction
                     .world
                     .emit_events(Some(TriggerEvent::Deleted(self.object_id)));
@@ -299,15 +299,15 @@ pub mod query {
     };
 
     use super::*;
-    use crate::{prelude::*, state::StateReadOnly};
+    use crate::{prelude::*, smartcontracts::triggers::set::SetReadOnly, state::StateReadOnly};
 
     impl ValidQuery for FindAllActiveTriggerIds {
         #[metrics(+"find_all_active_triggers")]
         fn execute<'state>(
             &self,
             state_ro: &'state impl StateReadOnly,
         ) -> Result<Box<dyn Iterator<Item = TriggerId> + 'state>, Error> {
-            Ok(Box::new(state_ro.world().triggers().ids().cloned()))
+            Ok(Box::new(state_ro.world().triggers().ids_iter().cloned()))
         }
     }