Unverified Commit 8347bf8e authored by Ashley's avatar Ashley Committed by GitHub
Browse files

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 a7063358.

* Switch branch again

* Revert "Switch branch again"

This reverts commit 04afc509.

* Update substrate branch
parent da237676
Pipeline #100006 passed with stages
in 28 minutes and 15 seconds
This diff is collapsed.
......@@ -172,10 +172,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)
})?
......@@ -509,12 +511,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(|
......
......@@ -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(|
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment