[refactor] hyperledger-iroha#1981, hyperledger-iroha#4195, hyperledge…

…r-iroha#3068: Use the auto-generated event sets instead of handwritten matchers Signed-off-by: Nikita Strygin <[email protected]>
DCNick3 · Mar 4, 2024 · 2e8fda3 · 2e8fda3
1 parent bb9746d
commit 2e8fda3
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 613 deletions.
diff --git a/client/tests/integration/triggers/data_trigger.rs b/client/tests/integration/triggers/data_trigger.rs
@@ -23,7 +23,7 @@ fn must_execute_both_triggers() -> Result<()> {
             Repeats::Indefinitely,
             account_id.clone(),
             TriggeringEventFilterBox::Data(DataEventFilter::Account(
-                AccountEventFilter::new().only_events(AccountEventMatcher::Created),
+                AccountEventFilter::new().only_events(AccountEventSet::Created),
             )),
         ),
     ));
@@ -36,7 +36,7 @@ fn must_execute_both_triggers() -> Result<()> {
             Repeats::Indefinitely,
             account_id,
             TriggeringEventFilterBox::Data(DataEventFilter::Domain(
-                DomainEventFilter::new().only_events(DomainEventMatcher::Created),
+                DomainEventFilter::new().only_events(DomainEventSet::Created),
             )),
         ),
     ));
@@ -89,7 +89,7 @@ fn domain_scoped_trigger_must_be_executed_only_on_events_in_its_domain() -> Resu
             Repeats::Indefinitely,
             account_id,
             TriggeringEventFilterBox::Data(DataEventFilter::Account(
-                AccountEventFilter::new().only_events(AccountEventMatcher::Created),
+                AccountEventFilter::new().only_events(AccountEventSet::Created),
             )),
         ),
     ));

diff --git a/client/tests/integration/triggers/event_trigger.rs b/client/tests/integration/triggers/event_trigger.rs
@@ -25,7 +25,7 @@ fn test_mint_asset_when_new_asset_definition_created() -> Result<()> {
             Repeats::Indefinitely,
             account_id,
             TriggeringEventFilterBox::Data(DataEventFilter::AssetDefinition(
-                AssetDefinitionEventFilter::new().only_events(AssetDefinitionEventMatcher::Created),
+                AssetDefinitionEventFilter::new().only_events(AssetDefinitionEventSet::Created),
             )),
         ),
     ));

diff --git a/data_model/src/events/data/events.rs b/data_model/src/events/data/events.rs
@@ -2,7 +2,7 @@
 #![allow(missing_docs)]
 
 use getset::Getters;
-use iroha_data_model_derive::{model, HasOrigin};
+use iroha_data_model_derive::{model, EventSet, HasOrigin};
 
 pub use self::model::*;
 use super::*;
@@ -18,6 +18,7 @@ macro_rules! data_event {
                 PartialOrd,
                 Ord,
                 HasOrigin,
+                EventSet,
                 parity_scale_codec::Decode,
                 parity_scale_codec::Encode,
                 serde::Deserialize,
@@ -642,18 +643,19 @@ impl DataEvent {
 
 pub mod prelude {
     pub use super::{
-        account::{AccountEvent, AccountPermissionChanged, AccountRoleChanged},
+        account::{AccountEvent, AccountEventSet, AccountPermissionChanged, AccountRoleChanged},
         asset::{
-            AssetChanged, AssetDefinitionEvent, AssetDefinitionOwnerChanged,
-            AssetDefinitionTotalQuantityChanged, AssetEvent,
+            AssetChanged, AssetDefinitionEvent, AssetDefinitionEventSet,
+            AssetDefinitionOwnerChanged, AssetDefinitionTotalQuantityChanged, AssetEvent,
+            AssetEventSet,
         },
-        config::ConfigurationEvent,
-        domain::{DomainEvent, DomainOwnerChanged},
+        config::{ConfigurationEvent, ConfigurationEventSet},
+        domain::{DomainEvent, DomainEventSet, DomainOwnerChanged},
         executor::{ExecutorEvent, ExecutorFilter},
-        peer::PeerEvent,
+        peer::{PeerEvent, PeerEventSet},
         permission::PermissionTokenSchemaUpdateEvent,
-        role::{PermissionRemoved, RoleEvent},
-        trigger::{TriggerEvent, TriggerNumberOfExecutionsChanged},
+        role::{PermissionRemoved, RoleEvent, RoleEventSet},
+        trigger::{TriggerEvent, TriggerEventSet, TriggerNumberOfExecutionsChanged},
         DataEvent, HasOrigin, MetadataChanged,
     };
 }