Experimental RuntimeDebug -> Debug substitutions.

bridges/bin/runtime-common/src/extensions/refund_relayer_extension.rs

@@ -148,7 +148,7 @@ pub struct PreDispatchData<AccountId> {
 }
 
 /// Type of the call that the extension recognizes.
-#[derive(RuntimeDebugNoBound, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub enum CallInfo {
 	/// Relay chain finality + parachain finality + message delivery/confirmation calls.
 	AllFinalityAndMsgs(
@@ -218,7 +218,7 @@ impl CallInfo {
 }
 
 /// The actions on relayer account that need to be performed because of his actions.
-#[derive(RuntimeDebug, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub enum RelayerAccountAction<AccountId, Reward> {
 	/// Do nothing with relayer account.
 	None,
@@ -419,14 +419,7 @@ pub trait RefundSignedExtension:
 /// Adapter that allow implementing `sp_runtime::traits::SignedExtension` for any
 /// `RefundSignedExtension`.
 #[derive(
-	DefaultNoBound,
-	CloneNoBound,
-	Decode,
-	Encode,
-	EqNoBound,
-	PartialEqNoBound,
-	RuntimeDebugNoBound,
-	TypeInfo,
+	DefaultNoBound, CloneNoBound, Decode, Encode, EqNoBound, PartialEqNoBound, Debug, TypeInfo,
 )]
 pub struct RefundSignedExtensionAdapter<T: RefundSignedExtension>(T);
 
@@ -561,14 +554,7 @@ where
 ///
 /// Extension does not refund transaction tip due to security reasons.
 #[derive(
-	DefaultNoBound,
-	CloneNoBound,
-	Decode,
-	Encode,
-	EqNoBound,
-	PartialEqNoBound,
-	RuntimeDebugNoBound,
-	TypeInfo,
+	DefaultNoBound, CloneNoBound, Decode, Encode, EqNoBound, PartialEqNoBound, Debug, TypeInfo,
 )]
 #[scale_info(skip_type_params(Runtime, Para, Msgs, Refund, Priority, Id))]
 pub struct RefundBridgedParachainMessages<Runtime, Para, Msgs, Refund, Priority, Id>(
@@ -723,14 +709,7 @@ where
 ///
 /// Extension does not refund transaction tip due to security reasons.
 #[derive(
-	DefaultNoBound,
-	CloneNoBound,
-	Decode,
-	Encode,
-	EqNoBound,
-	PartialEqNoBound,
-	RuntimeDebugNoBound,
-	TypeInfo,
+	DefaultNoBound, CloneNoBound, Decode, Encode, EqNoBound, PartialEqNoBound, Debug, TypeInfo,
 )]
 #[scale_info(skip_type_params(Runtime, GrandpaInstance, Msgs, Refund, Priority, Id))]
 pub struct RefundBridgedGrandpaMessages<Runtime, GrandpaInstance, Msgs, Refund, Priority, Id>(
@@ -856,14 +835,7 @@ where
 /// Transaction extension that refunds a relayer for standalone messages delivery and confirmation
 /// transactions. Finality transactions are not refunded.
 #[derive(
-	DefaultNoBound,
-	CloneNoBound,
-	Decode,
-	Encode,
-	EqNoBound,
-	PartialEqNoBound,
-	RuntimeDebugNoBound,
-	TypeInfo,
+	DefaultNoBound, CloneNoBound, Decode, Encode, EqNoBound, PartialEqNoBound, Debug, TypeInfo,
 )]
 #[scale_info(skip_type_params(Runtime, GrandpaInstance, Msgs, Refund, Priority, Id))]
 pub struct RefundBridgedMessages<Runtime, Msgs, Refund, Priority, Id>(

bridges/bin/runtime-common/src/messages_call_ext.rs

@@ -31,7 +31,7 @@ use sp_runtime::{transaction_validity::TransactionValidity, RuntimeDebug};
 use sp_std::ops::RangeInclusive;
 
 /// Generic info about a messages delivery/confirmation proof.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub struct BaseMessagesProofInfo {
 	/// Message lane, used by the call.
 	pub lane_id: LaneId,
@@ -55,7 +55,7 @@ impl BaseMessagesProofInfo {
 }
 
 /// Occupation state of the unrewarded relayers vector.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 #[cfg_attr(test, derive(Default))]
 pub struct UnrewardedRelayerOccupation {
 	/// The number of remaining unoccupied entries for new relayers.
@@ -65,7 +65,7 @@ pub struct UnrewardedRelayerOccupation {
 }
 
 /// Info about a `ReceiveMessagesProof` call which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub struct ReceiveMessagesProofInfo {
 	/// Base messages proof info
 	pub base: BaseMessagesProofInfo,
@@ -105,7 +105,7 @@ impl ReceiveMessagesProofInfo {
 }
 
 /// Info about a `ReceiveMessagesDeliveryProof` call which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub struct ReceiveMessagesDeliveryProofInfo(pub BaseMessagesProofInfo);
 
 impl ReceiveMessagesDeliveryProofInfo {
@@ -117,7 +117,7 @@ impl ReceiveMessagesDeliveryProofInfo {
 
 /// Info about a `ReceiveMessagesProof` or a `ReceiveMessagesDeliveryProof` call
 /// which tries to update a single lane.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub enum CallInfo {
 	/// Messages delivery call info.
 	ReceiveMessagesProof(ReceiveMessagesProofInfo),

bridges/chains/chain-bridge-hub-kusama/src/lib.rs

@@ -32,7 +32,7 @@ use frame_support::{
 use sp_runtime::RuntimeDebug;
 
 /// BridgeHubKusama parachain.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct BridgeHubKusama;
 
 impl Chain for BridgeHubKusama {

bridges/chains/chain-bridge-hub-polkadot/src/lib.rs

@@ -29,7 +29,7 @@ use frame_support::dispatch::DispatchClass;
 use sp_runtime::RuntimeDebug;
 
 /// BridgeHubPolkadot parachain.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct BridgeHubPolkadot;
 
 impl Chain for BridgeHubPolkadot {

bridges/chains/chain-bridge-hub-rococo/src/lib.rs

@@ -29,7 +29,7 @@ use frame_support::dispatch::DispatchClass;
 use sp_runtime::{MultiAddress, MultiSigner, RuntimeDebug};
 
 /// BridgeHubRococo parachain.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct BridgeHubRococo;
 
 impl Chain for BridgeHubRococo {

bridges/chains/chain-bridge-hub-westend/src/lib.rs

@@ -28,7 +28,7 @@ use frame_support::dispatch::DispatchClass;
 use sp_runtime::RuntimeDebug;
 
 /// BridgeHubWestend parachain.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct BridgeHubWestend;
 
 impl Chain for BridgeHubWestend {

bridges/modules/grandpa/src/call_ext.rs

@@ -37,7 +37,7 @@ use sp_runtime::{
 };
 
 /// Info about a `SubmitParachainHeads` call which tries to update a single parachain.
-#[derive(Copy, Clone, PartialEq, RuntimeDebug)]
+#[derive(Copy, Clone, PartialEq, Debug)]
 pub struct SubmitFinalityProofInfo<N> {
 	/// Number of the finality target.
 	pub block_number: N,
@@ -64,7 +64,7 @@ pub struct SubmitFinalityProofInfo<N> {
 }
 
 /// Verified `SubmitFinalityProofInfo<N>`.
-#[derive(Copy, Clone, PartialEq, RuntimeDebug)]
+#[derive(Copy, Clone, PartialEq, Debug)]
 pub struct VerifiedSubmitFinalityProofInfo<N> {
 	/// Base call information.
 	pub base: SubmitFinalityProofInfo<N>,

bridges/modules/grandpa/src/storage_types.rs

@@ -39,7 +39,7 @@ impl<T: Config<I>, I: 'static> Get<u32> for StoredAuthorityListLimit<T, I> {
 }
 
 /// A bounded GRANDPA Authority List and ID.
-#[derive(CloneNoBound, Decode, Encode, Eq, TypeInfo, MaxEncodedLen, RuntimeDebugNoBound)]
+#[derive(CloneNoBound, Decode, Encode, Eq, TypeInfo, MaxEncodedLen, Debug)]
 #[scale_info(skip_type_params(T, I))]
 pub struct StoredAuthoritySet<T: Config<I>, I: 'static> {
 	/// List of GRANDPA authorities for the current round.

bridges/modules/messages/src/inbound_lane.rs

@@ -54,7 +54,7 @@ pub trait InboundLaneStorage {
 /// these generic bounds all over the code.
 ///
 /// The encoding of this type matches encoding of the corresponding `MessageData`.
-#[derive(Encode, Decode, Clone, RuntimeDebug, PartialEq, Eq)]
+#[derive(Encode, Decode, Clone, Debug, PartialEq, Eq)]
 pub struct StoredInboundLaneData<T: Config<I>, I: 'static>(pub InboundLaneData<T::InboundRelayer>);
 
 impl<T: Config<I>, I: 'static> sp_std::ops::Deref for StoredInboundLaneData<T, I> {

bridges/modules/messages/src/outbound_lane.rs

@@ -52,7 +52,7 @@ pub trait OutboundLaneStorage {
 pub type StoredMessagePayload<T, I> = BoundedVec<u8, <T as Config<I>>::MaximalOutboundPayloadSize>;
 
 /// Result of messages receival confirmation.
-#[derive(Encode, Decode, RuntimeDebug, PartialEq, Eq, PalletError, TypeInfo)]
+#[derive(Encode, Decode, Debug, PartialEq, Eq, PalletError, TypeInfo)]
 pub enum ReceptionConfirmationError {
 	/// Bridged chain is trying to confirm more messages than we have generated. May be a result
 	/// of invalid bridged chain storage.

bridges/modules/parachains/src/call_ext.rs

@@ -31,7 +31,7 @@ use sp_runtime::{
 };
 
 /// Info about a `SubmitParachainHeads` call which tries to update a single parachain.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub struct SubmitParachainHeadsInfo {
 	/// Number and hash of the finalized relay block that has been used to prove parachain
 	/// finality.
@@ -46,7 +46,7 @@ pub struct SubmitParachainHeadsInfo {
 }
 
 /// Verified `SubmitParachainHeadsInfo`.
-#[derive(PartialEq, RuntimeDebug)]
+#[derive(PartialEq, Debug)]
 pub struct VerifiedSubmitParachainHeadsInfo {
 	/// Base call information.
 	pub base: SubmitParachainHeadsInfo,

bridges/primitives/beefy/src/lib.rs

@@ -130,7 +130,7 @@ pub type BeefyMmrLeafOf<C> = sp_consensus_beefy::mmr::MmrLeaf<
 ///
 /// Provides the initial context that the bridge needs in order to know
 /// where to start the sync process from.
-#[derive(Encode, Decode, RuntimeDebug, PartialEq, Clone, TypeInfo, Serialize, Deserialize)]
+#[derive(Encode, Decode, Debug, PartialEq, Clone, TypeInfo, Serialize, Deserialize)]
 pub struct InitializationData<BlockNumber, Hash> {
 	/// Pallet operating mode.
 	pub operating_mode: BasicOperatingMode,
@@ -142,7 +142,7 @@ pub struct InitializationData<BlockNumber, Hash> {
 }
 
 /// Basic data, stored by the pallet for every imported commitment.
-#[derive(Encode, Decode, RuntimeDebug, PartialEq, TypeInfo)]
+#[derive(Encode, Decode, Debug, PartialEq, TypeInfo)]
 pub struct ImportedCommitment<BlockNumber, BlockHash, MmrHash> {
 	/// Block number and hash of the finalized block parent.
 	pub parent_number_and_hash: (BlockNumber, BlockHash),

bridges/primitives/header-chain/src/justification/mod.rs

@@ -43,7 +43,7 @@ use sp_std::prelude::*;
 ///
 /// This particular proof is used to prove that headers on a bridged chain
 /// (so not our chain) have been finalized correctly.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo, RuntimeDebugNoBound)]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, TypeInfo, Debug)]
 pub struct GrandpaJustification<Header: HeaderT> {
 	/// The round (voting period) this justification is valid for.
 	pub round: u64,
@@ -108,7 +108,7 @@ impl<H: HeaderT> crate::FinalityProof<H::Hash, H::Number> for GrandpaJustificati
 }
 
 /// Justification verification error.
-#[derive(Eq, RuntimeDebug, PartialEq)]
+#[derive(Eq, Debug, PartialEq)]
 pub enum Error {
 	/// Failed to decode justification.
 	JustificationDecode,

bridges/primitives/header-chain/src/justification/verification/mod.rs

@@ -45,7 +45,7 @@ type SignedPrecommit<Header> = finality_grandpa::SignedPrecommit<
 >;
 
 /// Votes ancestries with useful methods.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct AncestryChain<Header: HeaderT> {
 	/// We expect all forks in the ancestry chain to be descendants of base.
 	base: HeaderId<Header::Hash, Header::Number>,
@@ -134,7 +134,7 @@ impl<Header: HeaderT> AncestryChain<Header> {
 }
 
 /// Justification verification error.
-#[derive(Eq, RuntimeDebug, PartialEq)]
+#[derive(Eq, Debug, PartialEq)]
 pub enum Error {
 	/// Could not convert `AuthorityList` to `VoterSet`.
 	InvalidAuthorityList,
@@ -152,7 +152,7 @@ pub enum Error {
 }
 
 /// Justification verification error.
-#[derive(Eq, RuntimeDebug, PartialEq)]
+#[derive(Eq, Debug, PartialEq)]
 pub enum PrecommitError {
 	/// Justification contains redundant votes.
 	RedundantAuthorityVote,
@@ -168,7 +168,7 @@ pub enum PrecommitError {
 }
 
 /// The context needed for validating GRANDPA finality proofs.
-#[derive(RuntimeDebug)]
+#[derive(Debug)]
 pub struct JustificationVerificationContext {
 	/// The authority set used to verify the justification.
 	pub voter_set: VoterSet<AuthorityId>,

bridges/primitives/header-chain/src/lib.rs

@@ -54,7 +54,7 @@ pub enum HeaderChainError {
 ///
 /// Even though we may store full header, our applications (XCM) only use couple of header
 /// fields. Extracting those values makes on-chain storage and PoV smaller, which is good.
-#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, Debug, TypeInfo)]
 pub struct StoredHeaderData<Number, Hash> {
 	/// Header number.
 	pub number: Number,
@@ -96,7 +96,7 @@ pub trait Parameter: Codec + EncodeLike + Clone + Eq + Debug + TypeInfo {}
 impl<T> Parameter for T where T: Codec + EncodeLike + Clone + Eq + Debug + TypeInfo {}
 
 /// A GRANDPA Authority List and ID.
-#[derive(Default, Encode, Eq, Decode, RuntimeDebug, PartialEq, Clone, TypeInfo)]
+#[derive(Default, Encode, Eq, Decode, Debug, PartialEq, Clone, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct AuthoritySet {
 	/// List of GRANDPA authorities for the current round.
@@ -116,7 +116,7 @@ impl AuthoritySet {
 ///
 /// The bridge needs to know where to start its sync from, and this provides that initial context.
 #[derive(
-	Default, Encode, Decode, RuntimeDebug, PartialEq, Eq, Clone, TypeInfo, Serialize, Deserialize,
+	Default, Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo, Serialize, Deserialize,
 )]
 pub struct InitializationData<H: HeaderT> {
 	/// The header from which we should start syncing.