Removed unused trait SenderOrigin (paritytech#1611)

serban300 · Oct 21, 2022 · 1d3ca90 · 1d3ca90
1 parent f89f721
commit 1d3ca90
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 55 deletions.
diff --git 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<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.
 #[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
@@ -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<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.
 #[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
@@ -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<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.
 #[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
@@ -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<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 {
 	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
@@ -27,23 +27,6 @@ use sp_std::{
 	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.
 pub type RelayersRewards<AccountId, Balance> = BTreeMap<AccountId, RelayerRewards<Balance>>;