Skip to content

Mock xcm #1977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaunxw merged 2 commits into from
Mar 24, 2022
Merged

Mock xcm #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4695082
update mock xcm
zqhxuyuan Mar 18, 2022
8b34a67
fix compile
zqhxuyuan Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 67 additions & 26 deletions node/e2e-tests/test-service/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#![allow(clippy::too_many_arguments)]

use super::*;
use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig};

/// Starts a `ServiceBuilder` for a full service.
///
Expand Down Expand Up @@ -75,26 +76,46 @@ pub fn new_partial(
SealMode::DevAuraSeal => {
// aura import queue
let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
let client_for_cidp = client.clone();

(
sc_consensus_aura::import_queue::<sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _>(
ImportQueueParams {
block_import: client.clone(),
justification_import: None,
client: client.clone(),
create_inherent_data_providers: move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

Ok((
timestamp,
slot,
node_service::default_mock_parachain_inherent_data_provider(),
))
create_inherent_data_providers: move |block: Hash, ()| {
let current_para_block = client_for_cidp
.number(block)
.expect("Header lookup should succeed")
.expect("Header passed in as parent should be present in backend.");
let client_for_xcm = client_for_cidp.clone();

async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

let mocked_parachain = MockValidationDataInherentDataProvider {
current_para_block,
relay_offset: 1000,
relay_blocks_per_para_block: 2,
xcm_config: MockXcmConfig::new(
&*client_for_xcm,
block,
Default::default(),
Default::default(),
),
raw_downward_messages: vec![],
raw_horizontal_messages: vec![],
};

Ok((timestamp, slot, mocked_parachain))
}
},
spawner: &task_manager.spawn_essential_handle(),
registry,
Expand Down Expand Up @@ -244,6 +265,8 @@ pub async fn start_dev_node(
// aura
let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
let client_for_cidp = client.clone();

let aura = sc_consensus_aura::start_aura::<
sp_consensus_aura::sr25519::AuthorityPair,
_,
Expand All @@ -264,19 +287,37 @@ pub async fn start_dev_node(
// block_import: instant_finalize::InstantFinalizeBlockImport::new(client.clone()),
block_import: client.clone(),
proposer_factory,
create_inherent_data_providers: move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

Ok((
timestamp,
slot,
node_service::default_mock_parachain_inherent_data_provider(),
))
create_inherent_data_providers: move |block: Hash, ()| {
let current_para_block = client_for_cidp
.number(block)
.expect("Header lookup should succeed")
.expect("Header passed in as parent should be present in backend.");
let client_for_xcm = client_for_cidp.clone();

async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

let mocked_parachain = MockValidationDataInherentDataProvider {
current_para_block,
relay_offset: 1000,
relay_blocks_per_para_block: 2,
xcm_config: MockXcmConfig::new(
&*client_for_xcm,
block,
Default::default(),
Default::default(),
),
raw_downward_messages: vec![],
raw_horizontal_messages: vec![],
};

Ok((timestamp, slot, mocked_parachain))
}
},
force_authoring,
backoff_authoring_blocks,
Expand Down
107 changes: 87 additions & 20 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use cumulus_relay_chain_interface::RelayChainInterface;
use cumulus_relay_chain_local::build_relay_chain_interface;

use acala_primitives::{Block, Hash};
use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider;
use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig};
use sc_client_api::ExecutorProvider;
use sc_consensus::LongestChain;
use sc_consensus_aura::ImportQueueParams;
Expand All @@ -56,6 +56,7 @@ pub use sc_service::{
ChainSpec,
};
pub use sp_api::ConstructRuntimeApi;
use sp_blockchain::HeaderBackend;

pub mod chain_spec;
mod client;
Expand Down Expand Up @@ -268,20 +269,43 @@ where
} else {
// aura import queue
let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
let client_for_cidp = client.clone();

sc_consensus_aura::import_queue::<AuraPair, _, _, _, _, _, _>(ImportQueueParams {
block_import: client.clone(),
justification_import: None,
client: client.clone(),
create_inherent_data_providers: move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
create_inherent_data_providers: move |block: Hash, ()| {
let current_para_block = client_for_cidp
.number(block)
.expect("Header lookup should succeed")
.expect("Header passed in as parent should be present in backend.");
let client_for_xcm = client_for_cidp.clone();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);
async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

Ok((timestamp, slot, default_mock_parachain_inherent_data_provider()))
let mocked_parachain = MockValidationDataInherentDataProvider {
current_para_block,
relay_offset: 1000,
relay_blocks_per_para_block: 2,
xcm_config: MockXcmConfig::new(
&*client_for_xcm,
block,
Default::default(),
Default::default(),
),
raw_downward_messages: vec![],
raw_horizontal_messages: vec![],
};

Ok((timestamp, slot, mocked_parachain))
}
},
spawner: &task_manager.spawn_essential_handle(),
registry,
Expand Down Expand Up @@ -724,6 +748,8 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result<Tas
}
});

let client_for_cidp = client.clone();

let authorship_future =
sc_consensus_manual_seal::run_manual_seal(sc_consensus_manual_seal::ManualSealParams {
block_import: client.clone(),
Expand All @@ -733,11 +759,28 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result<Tas
commands_stream: futures::stream_select!(commands_stream, import_stream),
select_chain,
consensus_data_provider: None,
create_inherent_data_providers: |_, _| async {
Ok((
sp_timestamp::InherentDataProvider::from_system_time(),
default_mock_parachain_inherent_data_provider(),
))
create_inherent_data_providers: move |block: Hash, _| {
let current_para_block = client_for_cidp
.number(block)
.expect("Header lookup should succeed")
.expect("Header passed in as parent should be present in backend.");
let client_for_xcm = client_for_cidp.clone();
async move {
let mocked_parachain = MockValidationDataInherentDataProvider {
current_para_block,
relay_offset: 1000,
relay_blocks_per_para_block: 2,
xcm_config: MockXcmConfig::new(
&*client_for_xcm,
block,
Default::default(),
Default::default(),
),
raw_downward_messages: vec![],
raw_horizontal_messages: vec![],
};
Ok((sp_timestamp::InherentDataProvider::from_system_time(), mocked_parachain))
}
},
});
// we spawn the future on a background thread managed by service.
Expand All @@ -751,21 +794,45 @@ fn inner_mandala_dev(config: Configuration, instant_sealing: bool) -> Result<Tas
// aura
let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone());
let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration();
let client_for_cidp = client.clone();

let aura = sc_consensus_aura::start_aura::<AuraPair, _, _, _, _, _, _, _, _, _, _, _>(StartAuraParams {
slot_duration: sc_consensus_aura::slot_duration(&*client)?,
client: client.clone(),
select_chain,
block_import: instant_finalize::InstantFinalizeBlockImport::new(client.clone()),
proposer_factory,
create_inherent_data_providers: move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
create_inherent_data_providers: move |block: Hash, ()| {
let current_para_block = client_for_cidp
.number(block)
.expect("Header lookup should succeed")
.expect("Header passed in as parent should be present in backend.");
let client_for_xcm = client_for_cidp.clone();

let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);
async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

Ok((timestamp, slot, default_mock_parachain_inherent_data_provider()))
let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*timestamp,
slot_duration,
);

let mocked_parachain = MockValidationDataInherentDataProvider {
current_para_block,
relay_offset: 1000,
relay_blocks_per_para_block: 2,
xcm_config: MockXcmConfig::new(
&*client_for_xcm,
block,
Default::default(),
Default::default(),
),
raw_downward_messages: vec![],
raw_horizontal_messages: vec![],
};

Ok((timestamp, slot, mocked_parachain))
}
},
force_authoring,
backoff_authoring_blocks,
Expand Down