diff --git a/.github/workflows/integration-tests-matrix.json b/.github/workflows/integration-tests-matrix.json index 48ce7e5681..e7cf6f55a3 100644 --- a/.github/workflows/integration-tests-matrix.json +++ b/.github/workflows/integration-tests-matrix.json @@ -26,5 +26,13 @@ { "name": "collectives-polkadot", "package": "collectives-polkadot-integration-tests" + }, + { + "name": "coretime-kusama", + "package": "coretime-kusama-integration-tests" + }, + { + "name": "coretime-polkadot", + "package": "coretime-polkadot-integration-tests" } ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4369f52c..255910f17b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Only allow apply slash to be executed if the slash amount is atleast ED ([SDK stable2503 #6540](https://github.com/paritytech/polkadot-sdk/pull/6540)). - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Paras-registrar: Improve error reporting ([SDK stable2503 #6989](https://github.com/paritytech/polkadot-sdk/pull/6989)). - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Xcm: convert properly assets in xcmpayment apis ([SDK stable2503 #7134](https://github.com/paritytech/polkadot-sdk/pull/7134)). + - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Ensure Consistent Topic IDs for Traceable Cross-Chain XCM ([SDK stable2503 #7691](https://github.com/paritytech/polkadot-sdk/pull/7691)). ### Fixed diff --git a/integration-tests/emulated/tests/coretime/coretime-kusama/src/tests/coretime_interface.rs b/integration-tests/emulated/tests/coretime/coretime-kusama/src/tests/coretime_interface.rs index 1f7d513829..776720bed1 100644 --- a/integration-tests/emulated/tests/coretime/coretime-kusama/src/tests/coretime_interface.rs +++ b/integration-tests/emulated/tests/coretime/coretime-kusama/src/tests/coretime_interface.rs @@ -15,6 +15,7 @@ use crate::*; use frame_support::traits::OnInitialize; +use kusama_runtime::Dmp; use kusama_runtime_constants::system_parachain::coretime::TIMESLICE_PERIOD; use pallet_broker::{ConfigRecord, Configuration, CoreAssignment, CoreMask, ScheduleItem}; use sp_runtime::Perbill; @@ -34,6 +35,10 @@ fn transact_hardcoded_weights_are_sane() { type CoretimeEvent = ::RuntimeEvent; type RelayEvent = ::RuntimeEvent; + Kusama::execute_with(|| { + Dmp::make_parachain_reachable(CoretimeKusama::para_id()); + }); + // Reserve a workload, configure broker and start sales. CoretimeKusama::execute_with(|| { // Hooks don't run in emulated tests - workaround as we need `on_initialize` to tick things diff --git a/integration-tests/emulated/tests/coretime/coretime-polkadot/src/tests/coretime_interface.rs b/integration-tests/emulated/tests/coretime/coretime-polkadot/src/tests/coretime_interface.rs index c0317301f2..d896c6951f 100644 --- a/integration-tests/emulated/tests/coretime/coretime-polkadot/src/tests/coretime_interface.rs +++ b/integration-tests/emulated/tests/coretime/coretime-polkadot/src/tests/coretime_interface.rs @@ -16,6 +16,7 @@ use crate::*; use frame_support::traits::OnInitialize; use pallet_broker::{ConfigRecord, Configuration, CoreAssignment, CoreMask, ScheduleItem}; +use polkadot_runtime::Dmp; use polkadot_runtime_constants::system_parachain::coretime::TIMESLICE_PERIOD; use sp_runtime::Perbill; @@ -34,6 +35,10 @@ fn transact_hardcoded_weights_are_sane() { type CoretimeEvent = ::RuntimeEvent; type RelayEvent = ::RuntimeEvent; + Polkadot::execute_with(|| { + Dmp::make_parachain_reachable(CoretimePolkadot::para_id()); + }); + // Reserve a workload, configure broker and start sales. CoretimePolkadot::execute_with(|| { // Hooks don't run in emulated tests - workaround as we need `on_initialize` to tick things diff --git a/system-parachains/coretime/coretime-kusama/src/tests.rs b/system-parachains/coretime/coretime-kusama/src/tests.rs index b5bcd7886f..38a88455f2 100644 --- a/system-parachains/coretime/coretime-kusama/src/tests.rs +++ b/system-parachains/coretime/coretime-kusama/src/tests.rs @@ -85,9 +85,8 @@ fn bulk_revenue_is_burnt() { renewal_bump: Perbill::from_percent(3), contribution_timeout: 1, }; - let ed = ExistentialDeposit::get(); assert_ok!(Broker::configure(RuntimeOrigin::root(), config.clone())); - assert_ok!(Broker::start_sales(RuntimeOrigin::root(), ed, 1)); + assert_ok!(Broker::start_sales(RuntimeOrigin::root(), UNITS, 1)); let sale_start = SaleInfo::::get().unwrap().sale_start; advance_to(sale_start + config.interlude_length); @@ -96,14 +95,17 @@ fn bulk_revenue_is_burnt() { let broker_account = BrokerPalletId::get().into_account_truncating(); let coretime_burn_account = CoretimeBurnAccount::get(); let treasury_account = xcm_config::RelayTreasuryPalletAccount::get(); - assert_ok!(Balances::mint_into(&AccountId::from(ALICE), 200 * ed)); + assert_ok!(Balances::mint_into(&AccountId::from(ALICE), 200 * UNITS)); let alice_balance_before = Balances::balance(&AccountId::from(ALICE)); let treasury_balance_before = Balances::balance(&treasury_account); let broker_balance_before = Balances::balance(&broker_account); let burn_balance_before = Balances::balance(&coretime_burn_account); // Purchase coretime. - assert_ok!(Broker::purchase(RuntimeOrigin::signed(AccountId::from(ALICE)), 100 * ed)); + assert_ok!(Broker::purchase( + RuntimeOrigin::signed(AccountId::from(ALICE)), + 100 * UNITS + )); // Alice decreases. assert!(Balances::balance(&AccountId::from(ALICE)) < alice_balance_before); diff --git a/system-parachains/coretime/coretime-polkadot/src/tests.rs b/system-parachains/coretime/coretime-polkadot/src/tests.rs index a1e23c9c55..fe7ea6a291 100644 --- a/system-parachains/coretime/coretime-polkadot/src/tests.rs +++ b/system-parachains/coretime/coretime-polkadot/src/tests.rs @@ -85,9 +85,8 @@ fn bulk_revenue_is_burnt() { renewal_bump: Perbill::from_percent(3), contribution_timeout: 1, }; - let ed = ExistentialDeposit::get(); assert_ok!(Broker::configure(RuntimeOrigin::root(), config.clone())); - assert_ok!(Broker::start_sales(RuntimeOrigin::root(), ed, 1)); + assert_ok!(Broker::start_sales(RuntimeOrigin::root(), UNITS, 1)); let sale_start = SaleInfo::::get().unwrap().sale_start; advance_to(sale_start + config.interlude_length); @@ -96,14 +95,17 @@ fn bulk_revenue_is_burnt() { let broker_account = BrokerPalletId::get().into_account_truncating(); let coretime_burn_account = CoretimeBurnAccount::get(); let treasury_account = xcm_config::RelayTreasuryPalletAccount::get(); - assert_ok!(Balances::mint_into(&AccountId::from(ALICE), 200 * ed)); + assert_ok!(Balances::mint_into(&AccountId::from(ALICE), 200 * UNITS)); let alice_balance_before = Balances::balance(&AccountId::from(ALICE)); let treasury_balance_before = Balances::balance(&treasury_account); let broker_balance_before = Balances::balance(&broker_account); let burn_balance_before = Balances::balance(&coretime_burn_account); // Purchase coretime. - assert_ok!(Broker::purchase(RuntimeOrigin::signed(AccountId::from(ALICE)), 100 * ed)); + assert_ok!(Broker::purchase( + RuntimeOrigin::signed(AccountId::from(ALICE)), + 100 * UNITS + )); // Alice decreases. assert!(Balances::balance(&AccountId::from(ALICE)) < alice_balance_before);