diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a01782f0a5..b422be4141 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,10 +72,6 @@ jobs: name: Publish to GCS run: | gsutil cp ./runtime/altair/target/srtool/release/wbuild/altair-runtime/altair_runtime.compact.compressed.wasm gs://centrifuge-artifact-releases/test-parachain/altair_runtime-$(git rev-parse --short HEAD).compact.compressed.wasm - - if: ${{ matrix.target == 'build-runtime-testnet' && matrix.package == 'altair-runtime' }} - name: Publish to GCS - run: | - gsutil cp ./runtime/altair/target/srtool/release/wbuild/altair-runtime/altair_runtime.compact.compressed.wasm gs://centrifuge-artifact-releases/parachain/algol-$(git rev-parse --short HEAD).compact.compressed.wasm - if: ${{ matrix.target == 'build-runtime' && matrix.package == 'centrifuge-runtime' }} name: Publish to GCS run: | diff --git a/Cargo.toml b/Cargo.toml index a9338c4c62..c398b2bfb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -280,10 +280,6 @@ fast-runtime = [ "runtime-integration-tests/fast-runtime", ] -testnet-runtime = [ - "altair-runtime/testnet-runtime", -] - # # Cargo patch rules for all the paritytech/ based crates. # diff --git a/ci/script.sh b/ci/script.sh index 7b576d984e..7f521d05ff 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -31,11 +31,6 @@ case $TARGET in docker run --rm -e PACKAGE=$PACKAGE -e BUILD_OPTS="--features=fast-runtime" -v $PWD:/build -v /tmp/cargo:/cargo-home paritytech/srtool:$SRTOOL_VERSION build ;; - build-runtime-testnet) - export RUSTC_VERSION=$RUST_TOOLCHAIN - docker run --rm -e PACKAGE=$PACKAGE -e BUILD_OPTS="--features=testnet-runtime" -v $PWD:/build -v /tmp/cargo:/cargo-home paritytech/srtool:$SRTOOL_VERSION build - ;; - tests) RUST_MIN_STACK=8388608 cargo test --workspace --release --features runtime-benchmarks,try-runtime --exclude runtime-integration-tests ;; diff --git a/runtime/altair/Cargo.toml b/runtime/altair/Cargo.toml index cc47ec8a65..fd339ef5ff 100644 --- a/runtime/altair/Cargo.toml +++ b/runtime/altair/Cargo.toml @@ -412,6 +412,3 @@ on-chain-release-build = [ # Set timing constants (e.g. session period) to faster versions to speed up testing. fast-runtime = [] - -# Allow to handle Algol and Altair differently -testnet-runtime = [] diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs index 47e56e71b1..d1bcc38fa1 100644 --- a/runtime/altair/src/lib.rs +++ b/runtime/altair/src/lib.rs @@ -1510,12 +1510,6 @@ impl pallet_pool_system::Config for Runtime { type WeightInfo = weights::pallet_pool_system::WeightInfo; } -#[cfg(not(feature = "testnet-runtime"))] -type PoolCreateOrigin = EnsureRoot; - -#[cfg(feature = "testnet-runtime")] -type PoolCreateOrigin = EnsureSigned; - impl pallet_pool_registry::Config for Runtime { type AssetRegistry = OrmlAssetRegistry; type Balance = Balance; @@ -1528,7 +1522,7 @@ impl pallet_pool_registry::Config for Runtime { type ModifyPool = pallet_pool_system::Pallet; type ModifyWriteOffPolicy = pallet_loans::Pallet; type Permission = Permissions; - type PoolCreateOrigin = PoolCreateOrigin; + type PoolCreateOrigin = EnsureRoot; type PoolId = PoolId; type RuntimeEvent = RuntimeEvent; type TrancheCurrency = TrancheCurrency; @@ -1864,7 +1858,6 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall { } } - #[cfg(not(feature = "testnet-runtime"))] fn check_self_contained(&self) -> Option> { use pallet_ethereum::TransactionAction; use runtime_common::evm::GetTransactionAction; @@ -1885,14 +1878,6 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall { } } - #[cfg(feature = "testnet-runtime")] - fn check_self_contained(&self) -> Option> { - match self { - RuntimeCall::Ethereum(call) => call.check_self_contained(), - _ => None, - } - } - fn validate_self_contained( &self, info: &Self::SignedInfo, diff --git a/runtime/altair/src/migrations.rs b/runtime/altair/src/migrations.rs index d0681593e1..78d647dedf 100644 --- a/runtime/altair/src/migrations.rs +++ b/runtime/altair/src/migrations.rs @@ -11,10 +11,8 @@ // GNU General Public License for more details. use frame_support::{traits::OnRuntimeUpgrade, weights::Weight}; -/// The migration set for Altair 1031 @ Kusama. It includes all the migrations -/// that have to be applied on that chain, which includes migrations that have -/// already been executed on Algol (1028 & 1029). -#[cfg(not(feature = "testnet-runtime"))] +/// The migration set for Altair 1034 @ Kusama. It includes all the migrations +/// that have to be applied on that chain. pub type UpgradeAltair1034 = ( // FIXME: This migration fails to decode 4 entries against Altair // orml_tokens_migration::CurrencyIdRefactorMigration, @@ -55,13 +53,6 @@ pub type UpgradeAltair1034 = ( runtime_common::migrations::precompile_account_codes::Migration, ); -/// The Upgrade set for Algol - it excludes the migrations already executed in -/// the side releases that only landed on Algol (1028 to 1031) but not yet on -/// Altair. -#[cfg(feature = "testnet-runtime")] -pub type UpgradeAltair1034 = - (runtime_common::migrations::precompile_account_codes::Migration); - mod asset_registry { use cfg_primitives::Balance; use cfg_types::{ diff --git a/src/chain_spec.rs b/src/chain_spec.rs index 8807ab3eff..baa6c0b4e8 100644 --- a/src/chain_spec.rs +++ b/src/chain_spec.rs @@ -361,10 +361,6 @@ pub fn antares_local(para_id: ParaId) -> AltairChainSpec { ) } -pub fn algol_config() -> AltairChainSpec { - AltairChainSpec::from_json_bytes(&include_bytes!("../res/algol-spec.json")[..]).unwrap() -} - pub fn charcoal_config() -> AltairChainSpec { AltairChainSpec::from_json_bytes(&include_bytes!("../res/charcoal-spec-raw.json")[..]).unwrap() } diff --git a/src/command.rs b/src/command.rs index fe8a891953..bd63342ae4 100644 --- a/src/command.rs +++ b/src/command.rs @@ -82,7 +82,6 @@ fn load_spec( "altair" => Ok(Box::new(chain_spec::altair_config())), "altair-dev" => Ok(Box::new(chain_spec::altair_dev(para_id))), "altair-local" => Ok(Box::new(chain_spec::altair_local(para_id))), - "algol" => Ok(Box::new(chain_spec::algol_config())), "catalyst" => Ok(Box::new(chain_spec::catalyst_config())), "catalyst-local" => Ok(Box::new(chain_spec::catalyst_local(para_id))), "antares" => Ok(Box::new(chain_spec::antares_config())),