Remove queueing from message-lane (#352)

* remove queueing from message-lane

* also remove queueing from RPCs

* another trace

* new clippy
This commit is contained in:
Svyatoslav Nikolsky
2020-09-15 15:14:52 +03:00
committed by Bastian Köcher
parent c2791c2772
commit d918bcb6f8
8 changed files with 29 additions and 370 deletions
+8 -34
View File
@@ -49,45 +49,26 @@ pub struct Message<Payload> {
pub payload: Payload,
}
/// Message processing result.
pub enum MessageResult<Payload> {
/// Message has been processed and should not be queued.
Processed,
/// Message has NOT been processed and should be queued for processing later.
NotProcessed(Message<Payload>),
}
/// Called when inbound message is received.
pub trait OnMessageReceived<Payload> {
/// Called when inbound message is received.
///
/// It is up to the implementers of this trait to determine whether the message
/// is invalid (i.e. improperly encoded, has too large weight, ...) or not. And,
/// if message is invalid, then it should be dropped immediately (by returning
/// `MessageResult::Processed`), or it'll block the lane forever.
fn on_message_received(&mut self, message: Message<Payload>) -> MessageResult<Payload>;
/// is invalid (i.e. improperly encoded, has too large weight, ...) or not.
fn on_message_received(message: Message<Payload>);
}
impl<Payload> OnMessageReceived<Payload> for () {
fn on_message_received(_message: Message<Payload>) {}
}
/// Inbound lane data.
#[derive(Encode, Decode, Clone)]
#[derive(Default, Encode, Decode, Clone)]
pub struct InboundLaneData {
/// Nonce of oldest message that we haven't processed yet. May point to not-yet-received message if
/// lane is currently empty.
pub oldest_unprocessed_nonce: MessageNonce,
/// Nonce of latest message that we have received from bridged chain.
pub latest_received_nonce: MessageNonce,
}
impl Default for InboundLaneData {
fn default() -> Self {
InboundLaneData {
// it is 1 because we're processing everything in [oldest_unprocessed_nonce; latest_received_nonce]
oldest_unprocessed_nonce: 1,
latest_received_nonce: 0,
}
}
}
/// Outbound lane data.
#[derive(Encode, Decode, Clone)]
pub struct OutboundLaneData {
@@ -96,8 +77,6 @@ pub struct OutboundLaneData {
pub oldest_unpruned_nonce: MessageNonce,
/// Nonce of latest message, received by bridged chain.
pub latest_received_nonce: MessageNonce,
/// Nonce of latest message, processed by bridged chain.
pub latest_processed_nonce: MessageNonce,
/// Nonce of latest message, generated by us.
pub latest_generated_nonce: MessageNonce,
}
@@ -108,7 +87,6 @@ impl Default for OutboundLaneData {
// it is 1 because we're pruning everything in [oldest_unpruned_nonce; latest_received_nonce]
oldest_unpruned_nonce: 1,
latest_received_nonce: 0,
latest_processed_nonce: 0,
latest_generated_nonce: 0,
}
}
@@ -116,11 +94,9 @@ impl Default for OutboundLaneData {
decl_runtime_apis! {
/// Outbound message lane API.
pub trait OutboundLaneApi<Payload: Decode> {
pub trait OutboundLaneApi {
/// Returns nonce of the latest message, received by bridged chain.
fn latest_received_nonce(lane: LaneId) -> MessageNonce;
/// Returns nonce of the latest message, processed by bridged chain.
fn latest_processed_nonce(lane: LaneId) -> MessageNonce;
/// Returns nonce of the latest message, generated by given lane.
fn latest_generated_nonce(lane: LaneId) -> MessageNonce;
}
@@ -129,7 +105,5 @@ decl_runtime_apis! {
pub trait InboundLaneApi {
/// Returns nonce of the latest message, received by given lane.
fn latest_received_nonce(lane: LaneId) -> MessageNonce;
/// Returns nonce of the latest message, processed by given lane.
fn latest_processed_nonce(lane: LaneId) -> MessageNonce;
}
}