refactor: use runtime prefix for all events, origins, calls

KILTprotocol · Dec 6, 2022 · fde113c · fde113c
1 parent 91d932b
commit fde113c
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/pallets/attestation/src/mock.rs b/pallets/attestation/src/mock.rs
@@ -276,7 +276,7 @@ pub(crate) mod runtime {
 	}
 
 	impl mock_origin::Config for Test {
-		type Origin = RuntimeOrigin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type AccountId = AccountId;
 		type SubjectId = SubjectId;
 	}

diff --git a/pallets/ctype/src/mock.rs b/pallets/ctype/src/mock.rs
@@ -124,7 +124,7 @@ pub mod runtime {
 	}
 
 	impl mock_origin::Config for Test {
-		type Origin = RuntimeOrigin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type AccountId = AccountId;
 		type SubjectId = SubjectId;
 	}

diff --git a/pallets/delegation/src/mock.rs b/pallets/delegation/src/mock.rs
@@ -269,7 +269,7 @@ pub(crate) mod runtime {
 	}
 
 	impl mock_origin::Config for Test {
-		type Origin = RuntimeOrigin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type AccountId = AccountId;
 		type SubjectId = SubjectId;
 	}

diff --git a/pallets/did/src/benchmarking.rs b/pallets/did/src/benchmarking.rs
@@ -102,7 +102,7 @@ fn generate_base_did_call_operation<T: Config>(
 	did: DidIdentifierOf<T>,
 	submitter: AccountIdOf<T>,
 ) -> DidAuthorizedCallOperation<T> {
-	let test_call = <T as Config>::Call::get_call_for_did_call_benchmark();
+	let test_call = <T as Config>::RuntimeCall::get_call_for_did_call_benchmark();
 
 	DidAuthorizedCallOperation {
 		did,

diff --git a/pallets/did/src/lib.rs b/pallets/did/src/lib.rs
@@ -173,7 +173,7 @@ pub mod pallet {
 	pub type BlockNumberOf<T> = <T as frame_system::Config>::BlockNumber;
 
 	/// Type for a runtime extrinsic callable under DID-based authorisation.
-	pub type DidCallableOf<T> = <T as Config>::Call;
+	pub type DidCallableOf<T> = <T as Config>::RuntimeCall;
 
 	/// Type for origin that supports a DID sender.
 	#[pallet::origin]
@@ -187,8 +187,8 @@ pub mod pallet {
 	pub trait Config: frame_system::Config + Debug {
 		/// Type for a dispatchable call that can be proxied through the DID
 		/// pallet to support DID-based authorisation.
-		type Call: Parameter
-			+ Dispatchable<PostInfo = PostDispatchInfo, RuntimeOrigin = <Self as Config>::Origin>
+		type RuntimeCall: Parameter
+			+ Dispatchable<PostInfo = PostDispatchInfo, RuntimeOrigin = <Self as Config>::RuntimeOrigin>
 			+ GetDispatchInfo
 			+ DeriveDidCallAuthorizationVerificationKeyRelationship;
 
@@ -197,9 +197,9 @@ pub mod pallet {
 
 		/// Origin type expected by the proxied dispatchable calls.
 		#[cfg(not(feature = "runtime-benchmarks"))]
-		type Origin: From<DidRawOrigin<DidIdentifierOf<Self>, AccountIdOf<Self>>>;
+		type RuntimeOrigin: From<DidRawOrigin<DidIdentifierOf<Self>, AccountIdOf<Self>>>;
 		#[cfg(feature = "runtime-benchmarks")]
-		type Origin: From<RawOrigin<DidIdentifierOf<Self>>>;
+		type RuntimeOrigin: From<RawOrigin<DidIdentifierOf<Self>>>;
 
 		/// The origin check for all DID calls inside this pallet.
 		type EnsureOrigin: EnsureOrigin<

diff --git a/pallets/did/src/mock.rs b/pallets/did/src/mock.rs
@@ -140,8 +140,8 @@ where
 
 impl Config for Test {
 	type DidIdentifier = DidIdentifier;
-	type Origin = RuntimeOrigin;
-	type Call = RuntimeCall;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
 	type EnsureOrigin = EnsureSigned<DidIdentifier>;
 	type OriginSuccess = AccountId;
 	type RuntimeEvent = ();

diff --git a/pallets/pallet-did-lookup/src/mock.rs b/pallets/pallet-did-lookup/src/mock.rs
@@ -123,7 +123,7 @@ impl pallet_did_lookup::Config for Test {
 }
 
 impl mock_origin::Config for Test {
-	type Origin = RuntimeOrigin;
+	type RuntimeOrigin = RuntimeOrigin;
 	type AccountId = AccountId;
 	type SubjectId = SubjectId;
 }

diff --git a/pallets/pallet-web3-names/src/mock.rs b/pallets/pallet-web3-names/src/mock.rs
@@ -168,7 +168,7 @@ pub(crate) mod runtime {
 	}
 
 	impl mock_origin::Config for Test {
-		type Origin = RuntimeOrigin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type AccountId = AccountId;
 		type SubjectId = SubjectId;
 	}

diff --git a/pallets/public-credentials/src/mock.rs b/pallets/public-credentials/src/mock.rs
@@ -284,7 +284,7 @@ pub(crate) mod runtime {
 	);
 
 	impl mock_origin::Config for Test {
-		type Origin = RuntimeOrigin;
+		type RuntimeOrigin = RuntimeOrigin;
 		type AccountId = AccountId;
 		type SubjectId = SubjectId;
 	}

diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
@@ -570,8 +570,8 @@ impl ctype::Config for Runtime {
 impl did::Config for Runtime {
 	type DidIdentifier = DidIdentifier;
 	type RuntimeEvent = RuntimeEvent;
-	type Call = RuntimeCall;
-	type Origin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type RuntimeOrigin = RuntimeOrigin;
 	type Currency = Balances;
 	type Deposit = constants::did::DidDeposit;
 	type Fee = constants::did::DidFee;

diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs
@@ -567,8 +567,8 @@ impl ctype::Config for Runtime {
 impl did::Config for Runtime {
 	type DidIdentifier = DidIdentifier;
 	type RuntimeEvent = RuntimeEvent;
-	type Call = RuntimeCall;
-	type Origin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type RuntimeOrigin = RuntimeOrigin;
 	type Currency = Balances;
 	type Deposit = constants::did::DidDeposit;
 	type Fee = constants::did::DidFee;

diff --git a/runtimes/standalone/src/lib.rs b/runtimes/standalone/src/lib.rs
@@ -380,8 +380,8 @@ parameter_types! {
 impl did::Config for Runtime {
 	type DidIdentifier = DidIdentifier;
 	type RuntimeEvent = RuntimeEvent;
-	type Call = RuntimeCall;
-	type Origin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	type RuntimeOrigin = RuntimeOrigin;
 	type Currency = Balances;
 	type Deposit = DidDeposit;
 	type Fee = DidFee;

diff --git a/support/src/mock.rs b/support/src/mock.rs
@@ -40,7 +40,7 @@ pub mod mock_origin {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type Origin: From<Origin<Self>>;
+		type RuntimeOrigin: From<Origin<Self>>;
 		type AccountId: Parameter;
 		type SubjectId: Parameter;
 	}