Update polkadot & substrate (#112)

This commit is contained in:
Cecile Tonglet
2020-06-15 12:40:15 +02:00
committed by GitHub
parent 41376cef61
commit 8b1fd65ed6
3 changed files with 924 additions and 933 deletions
+10 -4
View File
@@ -46,9 +46,15 @@ macro_rules! new_full_start {
crate::service::Executor,
>($config)?
.with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
let pool_api = Arc::new(sc_transaction_pool::FullChainApi::new(client.clone()));
let pool = sc_transaction_pool::BasicPool::new(config, pool_api, prometheus_registry);
.with_transaction_pool(|builder| {
let pool_api = Arc::new(sc_transaction_pool::FullChainApi::new(
builder.client().clone(),
));
let pool = sc_transaction_pool::BasicPool::new(
builder.config().transaction_pool.clone(),
pool_api,
builder.prometheus_registry(),
);
Ok(pool)
})?
.with_import_queue(|
@@ -101,7 +107,7 @@ pub fn run_collator(
.with_block_announce_validator(|_client| {
Box::new(block_announce_validator_copy)
})?
.build()?;
.build_full()?;
let registry = service.prometheus_registry();