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

Companion for Substrate #6123 (#1206)

Browse Source 
* Companion for Substrate #6123

* Update Substrate
This commit is contained in:
Bastian Köcher
2020-06-05 23:33:13 +02:00
committed by GitHub
parent 2ff55ca4b6
commit 11140c4202
2 changed files with 175 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+158 -157
View File
File diff suppressed because it is too large Load Diff
polkadot/service/src/lib.rs
+17 -7
View File
@@ -161,9 +161,13 @@ macro_rules! new_full_start {
.with_select_chain(|_, backend| { .with_select_chain(|_, backend| {
Ok(sc_consensus::LongestChain::new(backend.clone())) Ok(sc_consensus::LongestChain::new(backend.clone()))
})? })?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| { .with_transaction_pool(|builder| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone()); let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone());
let pool = sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api), prometheus_registry); let pool = sc_transaction_pool::BasicPool::new(
builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api),
builder.prometheus_registry(),
);
Ok(pool) Ok(pool)
})? })?
.with_import_queue(| .with_import_queue(|
@@ -552,12 +556,18 @@ macro_rules! new_light {
.with_select_chain(|_, backend| { .with_select_chain(|_, backend| {
Ok(sc_consensus::LongestChain::new(backend.clone())) Ok(sc_consensus::LongestChain::new(backend.clone()))
})? })?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| { .with_transaction_pool(|builder| {
let fetcher = fetcher let fetcher = builder.fetcher()
.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?; .ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone()); let pool_api = sc_transaction_pool::LightChainApi::new(
builder.client().clone(),
fetcher,
);
let pool = sc_transaction_pool::BasicPool::with_revalidation_type( let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
config, Arc::new(pool_api), prometheus_registry, sc_transaction_pool::RevalidationType::Light, builder.config().transaction_pool.clone(),
Arc::new(pool_api),
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
); );
Ok(pool) Ok(pool)
})? })?