pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-31 06:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[xcm-emulator] Redo Parachain init (#1356)

Browse Source 
* bring back proper init

* refactor block cycle

* ".git/.scripts/commands/fmt/fmt.sh"

* Update cumulus/xcm/xcm-emulator/src/lib.rs

Co-authored-by: Squirrel <gilescope@gmail.com>

---------

Co-authored-by: command-bot <>
Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Ignacio Palacios
2023-09-04 12:30:25 +02:00
committed by GitHub
parent a30092ab42
commit 2c35bc3d27
7 changed files with 142 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/xcm/xcm-emulator/src/lib.rs
+71 -57
View File
@@ -248,6 +248,14 @@ pub trait Parachain: Chain {
type ParachainInfo: Get<ParaId>;
type ParachainSystem;
fn init();
fn new_block();
fn finalize_block();
fn set_last_head();
fn para_id() -> ParaId {
Self::ext_wrapper(|| Self::ParachainInfo::get())
}
@@ -263,8 +271,6 @@ pub trait Parachain: Chain {
fn sovereign_account_id_of(location: MultiLocation) -> AccountId {
Self::LocationToAccountId::convert_location(&location).unwrap()
}
fn init();
}
pub trait Bridge {
@@ -603,28 +609,74 @@ macro_rules! decl_test_parachains {
type ParachainSystem = $crate::ParachainSystemPallet<<Self as $crate::Chain>::Runtime>;
type ParachainInfo = $parachain_info;
// We run an empty block during initialisation to open HRMP channels
// and have them ready for the next block
fn init() {
use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
// Set the last block head for later use in the next block
Self::set_last_head();
// Initialize a new block
Self::new_block();
// Finalize the new block
Self::finalize_block();
}
let para_id = Self::para_id();
fn new_block() {
use $crate::{Chain, HeadData, Network, NetworkComponent, Hooks, Encode, Parachain, TestExt};
let para_id = Self::para_id().into();
Self::ext_wrapper(|| {
// Increase Relay Chain block number
let mut relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
relay_block_number += 1;
<$name as NetworkComponent>::Network::set_relay_block_number(relay_block_number);
// Initialize a new Parachain block
let mut block_number = <Self as Chain>::System::block_number();
block_number += 1;
let parent_head_data = $crate::LAST_HEAD.with(|b| b.borrow_mut()
.get_mut(<Self as NetworkComponent>::Network::name())
.expect("network not initialized?")
.get(&para_id)
.expect("network not initialized?")
.clone()
);
<Self as Chain>::System::initialize(&block_number, &parent_head_data.hash(), &Default::default());
<<Self as Parachain>::ParachainSystem as Hooks<$crate::BlockNumber>>::on_initialize(block_number);
let _ = <Self as Parachain>::ParachainSystem::set_validation_data(
<Self as Chain>::RuntimeOrigin::none(),
<$name as NetworkComponent>::Network::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
);
});
}
fn finalize_block() {
use $crate::{Chain, Encode, Hooks, Network, NetworkComponent, Parachain, TestExt};
Self::ext_wrapper(|| {
let block_number = <Self as Chain>::System::block_number();
let mut relay_block_number = <Self as NetworkComponent>::Network::relay_block_number();
<Self as Parachain>::ParachainSystem::on_finalize(block_number);
});
// Get parent head data
let header = <Self as Chain>::System::finalize();
let parent_head_data = HeadData(header.encode());
Self::set_last_head();
}
fn set_last_head() {
use $crate::{Chain, Encode, HeadData, Network, NetworkComponent, Parachain, TestExt};
let para_id = Self::para_id().into();
Self::ext_wrapper(|| {
// Store parent head data for use later.
let created_header = <Self as Chain>::System::finalize();
$crate::LAST_HEAD.with(|b| b.borrow_mut()
.get_mut(<Self as NetworkComponent>::Network::name())
.expect("network not initialized?")
.insert(para_id.into(), parent_head_data.clone())
.insert(para_id, HeadData(created_header.encode()))
);
let next_block_number = block_number + 1;
<Self as Chain>::System::initialize(&next_block_number, &header.hash(), &Default::default());
<<Self as Parachain>::ParachainSystem as Hooks<$crate::BlockNumber>>::on_initialize(next_block_number);
});
}
}
@@ -746,43 +798,20 @@ macro_rules! __impl_test_ext_for_parachain {
// Make sure the Network is initialized
<$name as NetworkComponent>::Network::init();
let para_id = <$name>::para_id().into();
// Initialize block
$local_ext.with(|v| {
v.borrow_mut().execute_with(|| {
let parent_head_data = $crate::LAST_HEAD.with(|b| b.borrow_mut()
.get_mut(<Self as NetworkComponent>::Network::name())
.expect("network not initialized?")
.get(&para_id)
.expect("network not initialized?")
.clone()
);
// Increase block number
let mut relay_block_number = <$name as NetworkComponent>::Network::relay_block_number();
relay_block_number += 1;
<$name as NetworkComponent>::Network::set_relay_block_number(relay_block_number);
let _ = <Self as Parachain>::ParachainSystem::set_validation_data(
<Self as Chain>::RuntimeOrigin::none(),
<$name as NetworkComponent>::Network::hrmp_channel_parachain_inherent_data(para_id, relay_block_number, parent_head_data),
);
})
});
// Initialize a new block
Self::new_block();
// Execute
let r = $local_ext.with(|v| v.borrow_mut().execute_with(execute));
// provide inbound DMP/HRMP messages through a side-channel.
// normally this would come through the `set_validation_data`,
// but we go around that.
<$name as NetworkComponent>::Network::process_messages();
// Finalize the block
Self::finalize_block();
// Finalize block and send messages if needed
let para_id = <$name>::para_id().into();
// Send messages if needed
$local_ext.with(|v| {
v.borrow_mut().execute_with(|| {
let block_number = <Self as Chain>::System::block_number();
let mock_header = $crate::HeaderT::new(
0,
Default::default(),
@@ -791,16 +820,6 @@ macro_rules! __impl_test_ext_for_parachain {
Default::default(),
);
// Finalize to get xcmp messages.
<Self as Parachain>::ParachainSystem::on_finalize(block_number);
// Store parent head data for use later.
let created_header = <Self as Chain>::System::finalize();
$crate::LAST_HEAD.with(|b| b.borrow_mut()
.get_mut(<Self as NetworkComponent>::Network::name())
.expect("network not initialized?")
.insert(para_id.into(), $crate::HeadData(created_header.encode()))
);
let collation_info = <Self as Parachain>::ParachainSystem::collect_collation_info(&mock_header);
// send upward messages
@@ -834,11 +853,6 @@ macro_rules! __impl_test_ext_for_parachain {
// clean events
<Self as $crate::Chain>::System::reset_events();
// reinitialize before next call.
let next_block_number = block_number + 1;
<Self as $crate::Chain>::System::initialize(&next_block_number, &created_header.hash(), &Default::default());
<<Self as $crate::Parachain>::ParachainSystem as Hooks<$crate::BlockNumber>>::on_initialize(next_block_number);
})
});