Removed unused trait SenderOrigin (#1611)

This commit is contained in:
Branislav Kontur
2022-10-21 08:18:13 +02:00
committed by Bastian Köcher
parent 597ea49664
commit 829b23c7cf
5 changed files with 4 additions and 55 deletions
@@ -19,7 +19,7 @@
use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin};
use bp_messages::{ use bp_messages::{
source_chain::{SenderOrigin, TargetHeaderChain}, source_chain::TargetHeaderChain,
target_chain::{ProvedMessages, SourceHeaderChain}, target_chain::{ProvedMessages, SourceHeaderChain},
InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter,
}; };
@@ -277,13 +277,6 @@ impl SourceHeaderChain<bp_rialto::Balance> for Rialto {
} }
} }
impl SenderOrigin<crate::AccountId> for RuntimeOrigin {
fn linked_account(&self) -> Option<crate::AccountId> {
// XCM deals wit fees in our deployments
None
}
}
/// Millau -> Rialto message lane pallet parameters. /// Millau -> Rialto message lane pallet parameters.
#[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)]
pub enum MillauToRialtoMessagesParameter { pub enum MillauToRialtoMessagesParameter {
@@ -22,7 +22,7 @@
use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin};
use bp_messages::{ use bp_messages::{
source_chain::{SenderOrigin, TargetHeaderChain}, source_chain::TargetHeaderChain,
target_chain::{ProvedMessages, SourceHeaderChain}, target_chain::{ProvedMessages, SourceHeaderChain},
InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter,
}; };
@@ -284,16 +284,6 @@ impl SourceHeaderChain<bp_millau::Balance> for Millau {
} }
} }
impl SenderOrigin<crate::AccountId> for RuntimeOrigin {
fn linked_account(&self) -> Option<crate::AccountId> {
match self.caller {
crate::OriginCaller::system(frame_system::RawOrigin::Signed(ref submitter)) =>
Some(submitter.clone()),
_ => None,
}
}
}
/// RialtoParachain -> Millau message lane pallet parameters. /// RialtoParachain -> Millau message lane pallet parameters.
#[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)]
pub enum RialtoParachainToMillauMessagesParameter { pub enum RialtoParachainToMillauMessagesParameter {
@@ -19,7 +19,7 @@
use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin};
use bp_messages::{ use bp_messages::{
source_chain::{SenderOrigin, TargetHeaderChain}, source_chain::TargetHeaderChain,
target_chain::{ProvedMessages, SourceHeaderChain}, target_chain::{ProvedMessages, SourceHeaderChain},
InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter,
}; };
@@ -275,13 +275,6 @@ impl SourceHeaderChain<bp_millau::Balance> for Millau {
} }
} }
impl SenderOrigin<crate::AccountId> for RuntimeOrigin {
fn linked_account(&self) -> Option<crate::AccountId> {
// XCM deals wit fees in our deployments
None
}
}
/// Rialto -> Millau message lane pallet parameters. /// Rialto -> Millau message lane pallet parameters.
#[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)]
pub enum RialtoToMillauMessagesParameter { pub enum RialtoToMillauMessagesParameter {
+1 -11
View File
@@ -23,7 +23,7 @@ use bitvec::prelude::*;
use bp_messages::{ use bp_messages::{
source_chain::{ source_chain::{
LaneMessageVerifier, MessageDeliveryAndDispatchPayment, OnDeliveryConfirmed, LaneMessageVerifier, MessageDeliveryAndDispatchPayment, OnDeliveryConfirmed,
OnMessageAccepted, SenderOrigin, TargetHeaderChain, OnMessageAccepted, TargetHeaderChain,
}, },
target_chain::{ target_chain::{
DispatchMessage, MessageDispatch, ProvedLaneMessages, ProvedMessages, SourceHeaderChain, DispatchMessage, MessageDispatch, ProvedLaneMessages, ProvedMessages, SourceHeaderChain,
@@ -185,16 +185,6 @@ impl Config for TestRuntime {
type BridgedChainId = TestBridgedChainId; type BridgedChainId = TestBridgedChainId;
} }
impl SenderOrigin<AccountId> for RuntimeOrigin {
fn linked_account(&self) -> Option<AccountId> {
match self.caller {
OriginCaller::system(frame_system::RawOrigin::Signed(ref submitter)) =>
Some(*submitter),
_ => None,
}
}
}
impl Size for TestPayload { impl Size for TestPayload {
fn size(&self) -> u32 { fn size(&self) -> u32 {
16 + self.extra.len() as u32 16 + self.extra.len() as u32
@@ -27,23 +27,6 @@ use sp_std::{
ops::RangeInclusive, ops::RangeInclusive,
}; };
/// The sender of the message on the source chain.
pub trait SenderOrigin<AccountId> {
/// Return id of the account that is sending this message.
///
/// In regular messages configuration, when regular message is sent you'll always get `Some(_)`
/// from this call. This is the account that is paying send costs. However, there are some
/// examples when `None` may be returned from the call:
///
/// - if the send-message call origin is either `frame_system::RawOrigin::Root` or
/// `frame_system::RawOrigin::None` and your configuration forbids such messages;
/// - if your configuration allows 'unpaid' messages sent by pallets. Then the pallet may just
/// use its own defined origin (not linked to any account) and the message will be accepted.
/// This may be useful for pallets that are sending important system-wide information (like
/// update of runtime version).
fn linked_account(&self) -> Option<AccountId>;
}
/// Relayers rewards, grouped by relayer account id. /// Relayers rewards, grouped by relayer account id.
pub type RelayersRewards<AccountId, Balance> = BTreeMap<AccountId, RelayerRewards<Balance>>; pub type RelayersRewards<AccountId, Balance> = BTreeMap<AccountId, RelayerRewards<Balance>>;