BREAKING: Rename Origin (#12258)

* BREAKING: Rename Origin

* more renaming

* a bit more renaming

* fix

* more fixing

* fix in frame_support

* even more fixes

* fix

* small fix

* ...

* update .stderr

* docs

* update docs

* update docs

* docs

substrate/client/consensus/common/src/import_queue.rs

@@ -62,8 +62,8 @@ pub type BoxBlockImport<B, Transaction> =
 pub type BoxJustificationImport<B> =
 	Box<dyn JustificationImport<B, Error = ConsensusError> + Send + Sync>;
 
-/// Maps to the Origin used by the network.
-pub type Origin = libp2p::PeerId;
+/// Maps to the RuntimeOrigin used by the network.
+pub type RuntimeOrigin = libp2p::PeerId;
 
 /// Block data used by the queue.
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -79,7 +79,7 @@ pub struct IncomingBlock<B: BlockT> {
 	/// Justification(s) if requested.
 	pub justifications: Option<Justifications>,
 	/// The peer, we received this from
-	pub origin: Option<Origin>,
+	pub origin: Option<RuntimeOrigin>,
 	/// Allow importing the block skipping state verification if parent state is missing.
 	pub allow_missing_state: bool,
 	/// Skip block execution and state verification.
@@ -112,7 +112,7 @@ pub trait ImportQueue<B: BlockT>: Send {
 	/// Import block justifications.
 	fn import_justifications(
 		&mut self,
-		who: Origin,
+		who: RuntimeOrigin,
 		hash: B::Hash,
 		number: NumberFor<B>,
 		justifications: Justifications,
@@ -140,7 +140,7 @@ pub trait Link<B: BlockT>: Send {
 	/// Justification import result.
 	fn justification_imported(
 		&mut self,
-		_who: Origin,
+		_who: RuntimeOrigin,
 		_hash: &B::Hash,
 		_number: NumberFor<B>,
 		_success: bool,
@@ -155,9 +155,9 @@ pub trait Link<B: BlockT>: Send {
 #[derive(Debug, PartialEq)]
 pub enum BlockImportStatus<N: std::fmt::Debug + PartialEq> {
 	/// Imported known block.
-	ImportedKnown(N, Option<Origin>),
+	ImportedKnown(N, Option<RuntimeOrigin>),
 	/// Imported unknown block.
-	ImportedUnknown(N, ImportedAux, Option<Origin>),
+	ImportedUnknown(N, ImportedAux, Option<RuntimeOrigin>),
 }
 
 impl<N: std::fmt::Debug + PartialEq> BlockImportStatus<N> {
@@ -175,15 +175,15 @@ impl<N: std::fmt::Debug + PartialEq> BlockImportStatus<N> {
 pub enum BlockImportError {
 	/// Block missed header, can't be imported
 	#[error("block is missing a header (origin = {0:?})")]
-	IncompleteHeader(Option<Origin>),
+	IncompleteHeader(Option<RuntimeOrigin>),
 
 	/// Block verification failed, can't be imported
 	#[error("block verification failed (origin = {0:?}): {1}")]
-	VerificationFailed(Option<Origin>, String),
+	VerificationFailed(Option<RuntimeOrigin>, String),
 
 	/// Block is known to be Bad
 	#[error("bad block (origin = {0:?})")]
-	BadBlock(Option<Origin>),
+	BadBlock(Option<RuntimeOrigin>),
 
 	/// Parent state is missing.
 	#[error("block is missing parent state")]

substrate/client/consensus/common/src/import_queue/basic_queue.rs

@@ -34,7 +34,7 @@ use crate::{
 	import_queue::{
 		buffered_link::{self, BufferedLinkReceiver, BufferedLinkSender},
 		import_single_block_metered, BlockImportError, BlockImportStatus, BoxBlockImport,
-		BoxJustificationImport, ImportQueue, IncomingBlock, Link, Origin, Verifier,
+		BoxJustificationImport, ImportQueue, IncomingBlock, Link, RuntimeOrigin, Verifier,
 	},
 	metrics::Metrics,
 };
@@ -120,7 +120,7 @@ impl<B: BlockT, Transaction: Send> ImportQueue<B> for BasicQueue<B, Transaction>
 
 	fn import_justifications(
 		&mut self,
-		who: Origin,
+		who: RuntimeOrigin,
 		hash: B::Hash,
 		number: NumberFor<B>,
 		justifications: Justifications,
@@ -152,7 +152,7 @@ mod worker_messages {
 
 	pub struct ImportBlocks<B: BlockT>(pub BlockOrigin, pub Vec<IncomingBlock<B>>);
 	pub struct ImportJustification<B: BlockT>(
-		pub Origin,
+		pub RuntimeOrigin,
 		pub B::Hash,
 		pub NumberFor<B>,
 		pub Justification,
@@ -289,7 +289,7 @@ impl<B: BlockT> BlockImportWorker<B> {
 
 	async fn import_justification(
 		&mut self,
-		who: Origin,
+		who: RuntimeOrigin,
 		hash: B::Hash,
 		number: NumberFor<B>,
 		justification: Justification,
@@ -530,7 +530,7 @@ mod tests {
 
 		fn justification_imported(
 			&mut self,
-			_who: Origin,
+			_who: RuntimeOrigin,
 			hash: &Hash,
 			_number: BlockNumber,
 			_success: bool,

substrate/client/consensus/common/src/import_queue/buffered_link.rs

@@ -38,7 +38,7 @@
 //! });
 //! ```
 
-use crate::import_queue::{Link, Origin};
+use crate::import_queue::{Link, RuntimeOrigin};
 use futures::prelude::*;
 use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
@@ -82,7 +82,7 @@ impl<B: BlockT> Clone for BufferedLinkSender<B> {
 /// Internal buffered message.
 enum BlockImportWorkerMsg<B: BlockT> {
 	BlocksProcessed(usize, usize, Vec<(BlockImportResult<B>, B::Hash)>),
-	JustificationImported(Origin, B::Hash, NumberFor<B>, bool),
+	JustificationImported(RuntimeOrigin, B::Hash, NumberFor<B>, bool),
 	RequestJustification(B::Hash, NumberFor<B>),
 }
 
@@ -100,7 +100,7 @@ impl<B: BlockT> Link<B> for BufferedLinkSender<B> {
 
 	fn justification_imported(
 		&mut self,
-		who: Origin,
+		who: RuntimeOrigin,
 		hash: &B::Hash,
 		number: NumberFor<B>,
 		success: bool,

substrate/client/network/src/behaviour.rs

@@ -37,7 +37,7 @@ use libp2p::{
 };
 use log::debug;
 
-use sc_consensus::import_queue::{IncomingBlock, Origin};
+use sc_consensus::import_queue::{IncomingBlock, RuntimeOrigin};
 use sc_network_common::{
 	config::ProtocolId,
 	protocol::{
@@ -103,7 +103,7 @@ where
 /// Event generated by `Behaviour`.
 pub enum BehaviourOut<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
-	JustificationImport(Origin, B::Hash, NumberFor<B>, Justifications),
+	JustificationImport(RuntimeOrigin, B::Hash, NumberFor<B>, Justifications),
 
 	/// Started a random iterative Kademlia discovery query.
 	RandomKademliaStarted(ProtocolId),

substrate/client/network/src/protocol.rs

@@ -41,7 +41,9 @@ use message::{
 use notifications::{Notifications, NotificationsOut};
 use prometheus_endpoint::{register, Gauge, GaugeVec, Opts, PrometheusError, Registry, U64};
 use sc_client_api::HeaderBackend;
-use sc_consensus::import_queue::{BlockImportError, BlockImportStatus, IncomingBlock, Origin};
+use sc_consensus::import_queue::{
+	BlockImportError, BlockImportStatus, IncomingBlock, RuntimeOrigin,
+};
 use sc_network_common::{
 	config::ProtocolId,
 	protocol::ProtocolName,
@@ -1257,7 +1259,7 @@ fn prepare_warp_sync_request<B: BlockT>(
 #[must_use]
 pub enum CustomMessageOutcome<B: BlockT> {
 	BlockImport(BlockOrigin, Vec<IncomingBlock<B>>),
-	JustificationImport(Origin, B::Hash, NumberFor<B>, Justifications),
+	JustificationImport(RuntimeOrigin, B::Hash, NumberFor<B>, Justifications),
 	/// Notification protocols have been opened with a remote.
 	NotificationStreamOpened {
 		remote: PeerId,