choir: cleanup rococo and auxiliary scripts

Author: metricaez

polkadot/runtime/rococo/src/lib.rs

@@ -1224,24 +1224,6 @@ impl parachains_slashing::Config for Runtime {
 	type BenchmarkingConfig = parachains_slashing::BenchConfig<200>;
 }
 
-parameter_types! {
-	pub const MaxPublishItems: u32 = 16;
-	pub const MaxKeyLength: u32 = 256;
-	pub const MaxValueLength: u32 = 1024;
-	pub const MaxStoredKeys: u32 = 100;
-	pub const MaxSubscriptions: u32 = 100;
-	pub const MaxPublishers: u32 = 1000;
-}
-
-impl polkadot_runtime_parachains::broadcaster::Config for Runtime {
-	type MaxPublishItems = MaxPublishItems;
-	type MaxKeyLength = MaxKeyLength;
-	type MaxValueLength = MaxValueLength;
-	type MaxStoredKeys = MaxStoredKeys;
-	type MaxSubscriptions = MaxSubscriptions;
-	type MaxPublishers = MaxPublishers;
-}
-
 parameter_types! {
 	pub const ParaDeposit: Balance = 40 * UNITS;
 }
@@ -1616,7 +1598,6 @@ construct_runtime! {
 		Auctions: auctions = 72,
 		Crowdloan: crowdloan = 73,
 		Coretime: coretime = 74,
-		Broadcaster: polkadot_runtime_parachains::broadcaster = 75,
 
 		// Migrations pallet
 		MultiBlockMigrations: pallet_migrations = 98,
@@ -2029,7 +2010,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
-	#[api_version(16)]
+	#[api_version(15)]
 	impl polkadot_primitives::runtime_api::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<ValidatorId> {
 			parachains_runtime_api_impl::validators::<Runtime>()
@@ -2216,10 +2197,6 @@ sp_api::impl_runtime_apis! {
 		fn para_ids() -> Vec<ParaId> {
 			parachains_staging_runtime_api_impl::para_ids::<Runtime>()
 		}
-
-		fn get_subscribed_data(subscriber_para_id: ParaId) -> BTreeMap<ParaId, Vec<(Vec<u8>, Vec<u8>)>> {
-			Broadcaster::get_subscribed_data(subscriber_para_id)
-		}
 	}
 
 	#[api_version(6)]
@@ -2706,15 +2683,6 @@ sp_api::impl_runtime_apis! {
 					// The XCM executor of Rococo doesn't have a configured `Aliasers`
 					Err(BenchmarkError::Skip)
 				}
-
-				fn publish_origin() -> Result<Location, BenchmarkError> {
-					Ok(AssetHub::get())
-				}
-
-				fn valid_publisher() -> Result<u32, BenchmarkError> {
-					// Use Asset Hub's parachain ID as the publisher
-					Ok(rococo_runtime_constants::system_parachain::ASSET_HUB_ID)
-				}
 			}
 
 			let mut whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();

polkadot/runtime/rococo/src/weights/xcm/pallet_xcm_benchmarks_generic.rs

@@ -349,41 +349,12 @@ impl<T: frame_system::Config> WeightInfo<T> {
 		// Minimum execution time: 766_000 picoseconds.
 		Weight::from_parts(807_000, 0)
 	}
-	/// Storage: `Broadcaster::PublisherExists` (r:1 w:1)
-	/// Proof: `Broadcaster::PublisherExists` (`max_values`: None, `max_size`: Some(5), added: 2480, mode: `MaxEncodedLen`)
-	/// Storage: `Broadcaster::PublishedKeys` (r:1 w:1)
-	/// Proof: `Broadcaster::PublishedKeys` (`max_values`: None, `max_size`: Some(3205), added: 5680, mode: `MaxEncodedLen`)
-	/// Storage: `Broadcaster::PublishedDataRoots` (r:1 w:1)
-	/// Proof: `Broadcaster::PublishedDataRoots` (`max_values`: Some(1), `max_size`: Some(32027), added: 32522, mode: `MaxEncodedLen`)
-	/// Storage: UNKNOWN KEY `0x0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e` (r:0 w:1)
-	/// Storage: UNKNOWN KEY `0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f` (r:0 w:1)
-	/// Proof: UNKNOWN KEY `0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f` (r:0 w:1)
-	/// The range of component `n` is `[1, 16]`.
-	pub fn publish(n: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `222`
-		//  Estimated: `38487 + n * (14 ±0)`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(15_154_813, 0)
-			.saturating_add(Weight::from_parts(0, 38487))
-			// Standard Error: 6_584
-			.saturating_add(Weight::from_parts(4_663_489, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
-			.saturating_add(Weight::from_parts(0, 14).saturating_mul(n.into()))
-	}
-	/// Storage: `Broadcaster::Subscriptions` (r:1 w:1)
-	/// Proof: `Broadcaster::Subscriptions` (`max_values`: None, `max_size`: Some(422), added: 2897, mode: `MaxEncodedLen`)
+	pub fn publish(_n: u32, ) -> Weight {
+		// Template weights, not benchmarked
+		Weight::from_parts(100_000_000, 0)
+	}
 	pub fn subscribe() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `217`
-		//  Estimated: `3887`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3887))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Template weights, not benchmarked
+		Weight::from_parts(100_000_000, 0)
 	}
 }

polkadot/runtime/rococo/src/xcm_config.rs

@@ -17,9 +17,9 @@
 //! XCM configuration for Rococo.
 
 use super::{
-	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Broadcaster, Dmp, Fellows,
-	ParaId, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, Treasurer,
-	Treasury, WeightToFee, XcmPallet,
+	parachains_origin, AccountId, AllPalletsWithSystem, Balances, Dmp, Fellows, ParaId, Runtime,
+	RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, Treasurer, Treasury,
+	WeightToFee, XcmPallet,
 };
 
 use crate::governance::StakingAdmin;
@@ -42,10 +42,10 @@ use xcm_builder::{
 	AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative,
 	ChildParachainConvertsVia, DescribeAllTerminal, DescribeFamily, FixedWeightBounds,
 	FrameTransactionalProcessor, FungibleAdapter, HashedDescription, IsChildSystemParachain,
-	IsConcrete, MintLocation, OriginToPluralityVoice, ParachainBroadcastAdapter,
-	SendXcmFeeToAccount, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
-	WeightInfoBounds, WithComputedOrigin, WithUniqueTopic, XcmFeeManagerFromComponents,
+	IsConcrete, MintLocation, OriginToPluralityVoice, SendXcmFeeToAccount,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
+	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+	XcmFeeManagerFromComponents,
 };
 use xcm_executor::XcmExecutor;
 
@@ -227,7 +227,7 @@ impl xcm_executor::Config for XcmConfig {
 	type HrmpChannelAcceptedHandler = ();
 	type HrmpChannelClosingHandler = ();
 	type XcmRecorder = XcmPallet;
-	type BroadcastHandler = ParachainBroadcastAdapter<OnlyParachains, Broadcaster>;
+	type BroadcastHandler = ();
 }
 
 parameter_types! {