From 1d3ca90e2d5db1ceb9d59b1fe2a87a57c7c0f218 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Fri, 21 Oct 2022 08:18:13 +0200 Subject: [PATCH] Removed unused trait SenderOrigin (#1611) --- .../bin/millau/runtime/src/rialto_messages.rs | 9 +-------- .../runtime/src/millau_messages.rs | 12 +----------- .../bin/rialto/runtime/src/millau_messages.rs | 9 +-------- bridges/modules/messages/src/mock.rs | 12 +----------- bridges/primitives/messages/src/source_chain.rs | 17 ----------------- 5 files changed, 4 insertions(+), 55 deletions(-) diff --git a/bridges/bin/millau/runtime/src/rialto_messages.rs b/bridges/bin/millau/runtime/src/rialto_messages.rs index bb9f5dfe757..cf2bd4badaf 100644 --- a/bridges/bin/millau/runtime/src/rialto_messages.rs +++ b/bridges/bin/millau/runtime/src/rialto_messages.rs @@ -19,7 +19,7 @@ use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use bp_messages::{ - source_chain::{SenderOrigin, TargetHeaderChain}, + source_chain::TargetHeaderChain, target_chain::{ProvedMessages, SourceHeaderChain}, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, }; @@ -277,13 +277,6 @@ impl SourceHeaderChain for Rialto { } } -impl SenderOrigin for RuntimeOrigin { - fn linked_account(&self) -> Option { - // XCM deals wit fees in our deployments - None - } -} - /// Millau -> Rialto message lane pallet parameters. #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] pub enum MillauToRialtoMessagesParameter { diff --git a/bridges/bin/rialto-parachain/runtime/src/millau_messages.rs b/bridges/bin/rialto-parachain/runtime/src/millau_messages.rs index 14dc922e19c..4688f89a708 100644 --- a/bridges/bin/rialto-parachain/runtime/src/millau_messages.rs +++ b/bridges/bin/rialto-parachain/runtime/src/millau_messages.rs @@ -22,7 +22,7 @@ use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use bp_messages::{ - source_chain::{SenderOrigin, TargetHeaderChain}, + source_chain::TargetHeaderChain, target_chain::{ProvedMessages, SourceHeaderChain}, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, }; @@ -284,16 +284,6 @@ impl SourceHeaderChain for Millau { } } -impl SenderOrigin for RuntimeOrigin { - fn linked_account(&self) -> Option { - match self.caller { - crate::OriginCaller::system(frame_system::RawOrigin::Signed(ref submitter)) => - Some(submitter.clone()), - _ => None, - } - } -} - /// RialtoParachain -> Millau message lane pallet parameters. #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] pub enum RialtoParachainToMillauMessagesParameter { diff --git a/bridges/bin/rialto/runtime/src/millau_messages.rs b/bridges/bin/rialto/runtime/src/millau_messages.rs index ec8a7b822dc..43c95744165 100644 --- a/bridges/bin/rialto/runtime/src/millau_messages.rs +++ b/bridges/bin/rialto/runtime/src/millau_messages.rs @@ -19,7 +19,7 @@ use crate::{OriginCaller, Runtime, RuntimeCall, RuntimeOrigin}; use bp_messages::{ - source_chain::{SenderOrigin, TargetHeaderChain}, + source_chain::TargetHeaderChain, target_chain::{ProvedMessages, SourceHeaderChain}, InboundLaneData, LaneId, Message, MessageNonce, Parameter as MessagesParameter, }; @@ -275,13 +275,6 @@ impl SourceHeaderChain for Millau { } } -impl SenderOrigin for RuntimeOrigin { - fn linked_account(&self) -> Option { - // XCM deals wit fees in our deployments - None - } -} - /// Rialto -> Millau message lane pallet parameters. #[derive(RuntimeDebug, Clone, Encode, Decode, PartialEq, Eq, TypeInfo)] pub enum RialtoToMillauMessagesParameter { diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs index 4e6a6e53fbc..fd4c45a0eaa 100644 --- a/bridges/modules/messages/src/mock.rs +++ b/bridges/modules/messages/src/mock.rs @@ -23,7 +23,7 @@ use bitvec::prelude::*; use bp_messages::{ source_chain::{ LaneMessageVerifier, MessageDeliveryAndDispatchPayment, OnDeliveryConfirmed, - OnMessageAccepted, SenderOrigin, TargetHeaderChain, + OnMessageAccepted, TargetHeaderChain, }, target_chain::{ DispatchMessage, MessageDispatch, ProvedLaneMessages, ProvedMessages, SourceHeaderChain, @@ -185,16 +185,6 @@ impl Config for TestRuntime { type BridgedChainId = TestBridgedChainId; } -impl SenderOrigin for RuntimeOrigin { - fn linked_account(&self) -> Option { - match self.caller { - OriginCaller::system(frame_system::RawOrigin::Signed(ref submitter)) => - Some(*submitter), - _ => None, - } - } -} - impl Size for TestPayload { fn size(&self) -> u32 { 16 + self.extra.len() as u32 diff --git a/bridges/primitives/messages/src/source_chain.rs b/bridges/primitives/messages/src/source_chain.rs index e1f2c0c3c8d..4eb79edd848 100644 --- a/bridges/primitives/messages/src/source_chain.rs +++ b/bridges/primitives/messages/src/source_chain.rs @@ -27,23 +27,6 @@ use sp_std::{ ops::RangeInclusive, }; -/// The sender of the message on the source chain. -pub trait SenderOrigin { - /// 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; -} - /// Relayers rewards, grouped by relayer account id. pub type RelayersRewards = BTreeMap>;