Remove rococo/polkadot feature gate

Author: bkontur

.github/workflows/check.yml

@@ -70,13 +70,9 @@ jobs:
           cache-on-failure: true
           cache-all-crates: true
 
-      - name: Cargo check (Rococo) (benchmarking)
+      - name: Cargo check benchmarking
         run: |
-          cargo check --workspace --features=rococo,runtime-benchmarks
-
-      - name: Cargo check (Polkadot) (benchmarking)
-        run: |
-          cargo check --workspace --features=polkadot,runtime-benchmarks
+          cargo check --workspace --features=runtime-benchmarks
 
   test:
     name: Test
@@ -103,10 +99,10 @@ jobs:
 
       - name: Run (Rococo) runtime tests
         run: |
-          cargo test -p polkadot-bulletin-chain-runtime --features=rococo
-          cargo test -p polkadot-bulletin-chain-runtime --features=rococo,runtime-benchmarks
+          cargo test -p polkadot-bulletin-chain-runtime
+          cargo test -p polkadot-bulletin-chain-runtime --features=runtime-benchmarks
 
       - name: Run (Polkadot) runtime tests
         run: |
-          cargo test -p polkadot-bulletin-chain-runtime --features=polkadot
-          cargo test -p polkadot-bulletin-chain-runtime --features=polkadot,runtime-benchmarks
+          cargo test -p bulletin-polkadot-runtime
+          cargo test -p bulletin-polkadot-runtime --features=runtime-benchmarks

Cargo.lock

@@ -21,12 +21,12 @@ tracing = { version = "0.1.41", default-features = false }
 try-runtime-cli = { version = "0.42" }
 
 # Local workspace members
+bulletin-polkadot-runtime = { version = "1.0.0", path = "runtimes/bulletin-polkadot" }
 pallet-relayer-set = { version = "1.0.0", path = "pallets/relayer-set", default-features = false }
 pallet-transaction-storage = { version = "4.0.0-dev", path = "pallets/transaction-storage", default-features = false }
 pallet-validator-set = { version = "1.0.0", path = "pallets/validator-set", default-features = false }
 pallets-common = { version = "0.1.0", path = "pallets/common", default-features = false }
 polkadot-bulletin-chain-runtime = { version = "0.1.0-dev", path = "runtime" }
-bulletin-polkadot-runtime = { version = "1.0.0", path = "runtimes/bulletin-polkadot" }
 
 # Polkadot SDK crates (shared git revision)
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "db5e645422ccf952018a3c466a33fef477858602", default-features = false }

Cargo.toml

@@ -58,7 +58,10 @@ frame-benchmarking = { workspace = true }
 frame-benchmarking-cli = { workspace = true }
 
 # Local Dependencies
+# Rococo testnet
 polkadot-bulletin-chain-runtime = { workspace = true }
+# Polkadot production
+bulletin-polkadot-runtime = { workspace = true }
 
 # CLI-specific dependencies
 try-runtime-cli = { optional = true, workspace = true }
@@ -67,12 +70,9 @@ try-runtime-cli = { optional = true, workspace = true }
 substrate-build-script-utils = { workspace = true }
 
 [features]
-default = [
-	# TODO: temporary let's activate rococo by default
-	"rococo",
-]
 # Dependencies that are only required if runtime benchmarking should be built.
 runtime-benchmarks = [
+	"bulletin-polkadot-runtime/runtime-benchmarks",
 	"frame-benchmarking-cli/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
@@ -83,12 +83,9 @@ runtime-benchmarks = [
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
 try-runtime = [
+	"bulletin-polkadot-runtime/try-runtime",
 	"frame-system/try-runtime",
 	"polkadot-bulletin-chain-runtime/try-runtime",
 	"sp-runtime/try-runtime",
 	"try-runtime-cli/try-runtime",
 ]
-# To bridge with Rococo Bridge Hub
-rococo = ["polkadot-bulletin-chain-runtime/rococo"]
-# To bridge with PeoplePolkadot
-polkadot = ["polkadot-bulletin-chain-runtime/polkadot"]

node/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-bulletin-chain-runtime"
 version = "0.1.0-dev"
-description = "Runtime for the Polkadot Bulletin Chain"
+description = "Runtime for the Rococo Bulletin Chain"
 authors = ["Parity Technologies <[email protected]>"]
 edition.workspace = true
 license = "MIT-0"
@@ -12,7 +12,6 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-cfg-if = { workspace = true }
 codec = { workspace = true, features = ["derive"] }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -243,5 +242,3 @@ try-runtime = [
 	"parachains-common?/try-runtime",
 	"sp-runtime/try-runtime",
 ]
-rococo = []
-polkadot = []

runtime/Cargo.toml

@@ -1,5 +1,3 @@
-#![cfg(feature = "rococo")]
-
 //! With Rococo Bridge Hub bridge configuration.
 
 use crate::{
@@ -486,9 +484,9 @@ pub type ToBridgeHaulBlobExporter = HaulBlobExporter<
 // 		bp_test_utils::test_header_with_root(POLKADOT_HEADER_NUMBER, state_root)
 // 	}
 //
-// 	fn polkadot_grandpa_justification(t: HeaderType) -> GrandpaJustification<bp_polkadot_core::Header> {
-// 		bp_test_utils::make_default_justification(&polkadot_header(t))
-// 	}
+// 	fn polkadot_grandpa_justification(t: HeaderType) ->
+// GrandpaJustification<bp_polkadot_core::Header> { 		bp_test_utils::make_default_justification(&
+// polkadot_header(t)) 	}
 //
 // 	fn bridge_hub_polkadot_header(t: HeaderType) -> bp_bridge_hub_polkadot::Header {
 // 		bp_test_utils::test_header_with_root(

runtime/src/bridge_config.rs

@@ -3,12 +3,6 @@ use crate::{
 	SessionConfig, Signature, SudoConfig, ValidatorSetConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
 
-#[cfg(feature = "polkadot")]
-use crate::{
-	bridge_config::XCM_LANE, BridgePolkadotGrandpaConfig, BridgePolkadotMessagesConfig,
-	BridgePolkadotParachainsConfig,
-};
-#[cfg(feature = "rococo")]
 use crate::{
 	bridge_config::XCM_LANE, BridgeRococoGrandpaConfig, BridgeRococoMessagesConfig,
 	BridgeRococoParachainsConfig,
@@ -85,38 +79,19 @@ fn testnet_genesis(
 			// would want to use separate keys for the relayers.
 			initial_relayers: initial_authorities.into_iter().map(|x| x.0).collect::<Vec<_>>(),
 		},
-		#[cfg(feature = "rococo")]
 		bridge_rococo_grandpa: BridgeRococoGrandpaConfig {
 			owner: bridges_pallet_owner.clone(),
 			..Default::default()
 		},
-		#[cfg(feature = "rococo")]
 		bridge_rococo_parachains: BridgeRococoParachainsConfig {
 			owner: bridges_pallet_owner.clone(),
 			..Default::default()
 		},
-		#[cfg(feature = "rococo")]
 		bridge_rococo_messages: BridgeRococoMessagesConfig {
 			owner: bridges_pallet_owner,
 			opened_lanes: vec![XCM_LANE],
 			..Default::default()
 		},
-		#[cfg(feature = "polkadot")]
-		bridge_polkadot_grandpa: BridgePolkadotGrandpaConfig {
-			owner: bridges_pallet_owner.clone(),
-			..Default::default()
-		},
-		#[cfg(feature = "polkadot")]
-		bridge_polkadot_parachains: BridgePolkadotParachainsConfig {
-			owner: bridges_pallet_owner.clone(),
-			..Default::default()
-		},
-		#[cfg(feature = "polkadot")]
-		bridge_polkadot_messages: BridgePolkadotMessagesConfig {
-			owner: bridges_pallet_owner,
-			opened_lanes: vec![XCM_LANE],
-			..Default::default()
-		},
 		..Default::default()
 	};