Companion PR for ' Simplify a few chain components creation APIs related to the service' (#1384)

* Switch branch

* Fix service creation

* Revert "Switch branch"

This reverts commit a706335821eb1553e48f86e0b0c5b3c11d589a1d.

* Switch branch again

* Revert "Switch branch again"

This reverts commit 04afc5095e408ff9a116c526ef84f6b101482ee1.

* Update substrate branch
This commit is contained in:
Ashley
2020-07-09 16:59:58 +02:00
committed by GitHub
parent 8130d8210e
commit 1c5f9b09ba
3 changed files with 151 additions and 145 deletions
+6 -4
View File
@@ -160,10 +160,12 @@ macro_rules! new_full_start {
builder.client().clone(),
builder.prometheus_registry(),
);
let pool = sc_transaction_pool::BasicPool::new(
let pool = sc_transaction_pool::BasicPool::new_full(
builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api),
builder.prometheus_registry(),
builder.spawn_handle(),
builder.client().clone(),
);
Ok(pool)
})?
@@ -626,12 +628,12 @@ macro_rules! new_light {
builder.client().clone(),
fetcher,
);
let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
let pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
builder.config().transaction_pool.clone(),
Arc::new(pool_api),
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
);
builder.spawn_handle(),
));
Ok(pool)
})?
.with_import_queue_and_fprb(|