pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 14:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make message-lane Event generic (#345)

Browse Source 
* make message-lane Event generic

* cargo fmt --all

* Update modules/message-lane/src/lib.rs

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>

Co-authored-by: Hernando Castano <HCastano@users.noreply.github.com>
This commit is contained in:
Svyatoslav Nikolsky
2020-09-11 23:09:47 +03:00
committed by Bastian Köcher
parent 54553df8dc
commit fce133e2cb
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/modules/message-lane/src/lib.rs
+17 -5
View File
@@ -49,7 +49,7 @@ mod mock;
/// The module configuration trait /// The module configuration trait
pub trait Trait<I = DefaultInstance>: frame_system::Trait { pub trait Trait<I = DefaultInstance>: frame_system::Trait {
/// They overarching event type. /// They overarching event type.
type Event: From<Event> + Into<<Self as frame_system::Trait>::Event>; type Event: From<Event<Self, I>> + Into<<Self as frame_system::Trait>::Event>;
/// Message payload. /// Message payload.
type Payload: Parameter; type Payload: Parameter;
/// Maximal number of messages that may be pruned during maintenance. Maintenance occurs /// Maximal number of messages that may be pruned during maintenance. Maintenance occurs
@@ -75,13 +75,17 @@ decl_storage! {
} }
decl_event!( decl_event!(
pub enum Event { pub enum Event<T, I = DefaultInstance> where
<T as frame_system::Trait>::AccountId,
{
/// Message has been accepted and is waiting to be delivered. /// Message has been accepted and is waiting to be delivered.
MessageAccepted(LaneId, MessageNonce), MessageAccepted(LaneId, MessageNonce),
/// Messages in the inclusive range have been delivered to the bridged chain. /// Messages in the inclusive range have been delivered to the bridged chain.
MessagesDelivered(LaneId, MessageNonce, MessageNonce), MessagesDelivered(LaneId, MessageNonce, MessageNonce),
/// Messages in the inclusive range have been processed by the bridged chain. /// Messages in the inclusive range have been processed by the bridged chain.
MessagesProcessed(LaneId, MessageNonce, MessageNonce), MessagesProcessed(LaneId, MessageNonce, MessageNonce),
/// Phantom member, never used.
Dummy(PhantomData<(AccountId, I)>),
} }
); );
@@ -102,7 +106,7 @@ decl_module! {
let nonce = lane.send_message(payload); let nonce = lane.send_message(payload);
lane.prune_messages(T::MaxMessagesToPruneAtOnce::get()); lane.prune_messages(T::MaxMessagesToPruneAtOnce::get());
Self::deposit_event(Event::MessageAccepted(lane_id, nonce)); Self::deposit_event(RawEvent::MessageAccepted(lane_id, nonce));
} }
} }
} }
@@ -153,7 +157,11 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
let received_range = lane.confirm_receival(latest_received_nonce); let received_range = lane.confirm_receival(latest_received_nonce);
if let Some(received_range) = received_range { if let Some(received_range) = received_range {
Self::deposit_event(Event::MessagesDelivered(*lane_id, received_range.0, received_range.1)); Self::deposit_event(RawEvent::MessagesDelivered(
*lane_id,
received_range.0,
received_range.1,
));
} }
} }
@@ -166,7 +174,11 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
let processed_range = lane.confirm_processing(latest_processed_nonce); let processed_range = lane.confirm_processing(latest_processed_nonce);
if let Some(processed_range) = processed_range { if let Some(processed_range) = processed_range {
Self::deposit_event(Event::MessagesProcessed(*lane_id, processed_range.0, processed_range.1)); Self::deposit_event(RawEvent::MessagesProcessed(
*lane_id,
processed_range.0,
processed_range.1,
));
} }
} }
} }
bridges/modules/message-lane/src/mock.rs
+1 -1
View File
@@ -38,7 +38,7 @@ mod message_lane {
impl_outer_event! { impl_outer_event! {
pub enum TestEvent for TestRuntime { pub enum TestEvent for TestRuntime {
frame_system<T>, frame_system<T>,
message_lane, message_lane<T>,
} }
} }