Apply suggestions from code review

Co-authored-by: Branislav Kontur <[email protected]>

Author: dmitry-markin

pallets/relayer-set/src/lib.rs

@@ -46,8 +46,6 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
-		#[allow(deprecated)]
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 		/// Origin for adding or removing a relayer.

pallets/transaction-storage/src/lib.rs

@@ -147,8 +147,6 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
-		#[allow(deprecated)]
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 		/// Maximum number of indexed transactions in a block.

pallets/validator-set/src/mock.rs

@@ -146,12 +146,10 @@ impl pallet_session::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = pallets_common::NoCurrency<AccountId, RuntimeHoldReason>;
 	type KeyDeposit = ();
-	// TODO: check this
 	type DisablingStrategy = ();
 }
 
 impl pallet_session::historical::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type FullIdentification = Self::ValidatorId;
 	type FullIdentificationOf = Self::ValidatorIdOf;
 }

runtime/src/bridge_config.rs

@@ -244,6 +244,7 @@ where
 			.and_then(|payload| decode_bridge_message(payload).map(|(_, xcm)| xcm).map_err(drop))
 			.and_then(|xcm| xcm.try_into().map_err(drop))
 			// TODO: FAIL-CI Weight::MAX maybe change for something else, hard-coded or Weight::MAX/4...
+			// TODO: (real weights) https://github.com/paritytech/polkadot-bulletin-chain/issues/22
 			.and_then(|xcm| XcmExecutor::<XcmConfig>::prepare(xcm, Weight::MAX).map_err(drop))
 			.map(|weighed_xcm| weighed_xcm.weight_of())
 			.unwrap_or(Weight::zero())

runtime/src/lib.rs

@@ -276,7 +276,6 @@ impl pallet_session::Config for Runtime {
 }
 
 impl pallet_session::historical::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type FullIdentification = Self::ValidatorId;
 	type FullIdentificationOf = Self::ValidatorIdOf;
 }
@@ -388,7 +387,7 @@ construct_runtime!(
 		// Authorship must be before session in order to note author in the correct session.
 		Authorship: pallet_authorship::{Pallet, Storage} = 10,
 		Offences: pallet_offences::{Pallet, Storage, Event} = 11,
-		Historical: pallet_session::historical::{Pallet, Event<T>} = 12,
+		Historical: pallet_session::historical = 12,
 		ValidatorSet: pallet_validator_set::{Pallet, Storage, Event<T>, Config<T>} = 13,
 		Session: pallet_session = 14,
 		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event, ValidateUnsigned} = 15,

runtime/src/weights/mod.rs

@@ -22,6 +22,7 @@ impl pallet_bridge_parachains::WeightInfoExt
 	for bridge_polkadot_parachains::WeightInfo<crate::Runtime>
 {
 	fn expected_extra_storage_proof_size() -> u32 {
+                // TODO: (clean up) https://github.com/paritytech/polkadot-bulletin-chain/issues/22
 		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
 	}
 
@@ -38,6 +39,7 @@ impl pallet_bridge_messages::WeightInfoExt
 	for bridge_polkadot_messages::WeightInfo<crate::Runtime>
 {
 	fn expected_extra_storage_proof_size() -> u32 {
+                // TODO: (clean up) https://github.com/paritytech/polkadot-bulletin-chain/issues/22
 		bp_bridge_hub_rococo::EXTRA_STORAGE_PROOF_SIZE
 	}