[refactor] #1981, #4195, #3068: Use the auto-generated event sets ins…

…tead of handwritten matchers Signed-off-by: Nikita Strygin <[email protected]>
hyperledger-iroha · Mar 1, 2024 · 6676b37 · 6676b37
1 parent bb9746d
commit 6676b37
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 382 deletions.
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,
     };
 }