Update Substrate & Polkadot (#551)

* Update Substrate & Polkadot

* Update client/service/src/lib.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

* Update client/service/src/lib.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

Co-authored-by: Andronik Ordian <write@reusable.software>
This commit is contained in:
Bastian Köcher
2021-07-27 22:42:39 +02:00
committed by GitHub
parent 17eedeafec
commit 1b92af9042
3 changed files with 499 additions and 385 deletions
+493 -379
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -405,7 +405,7 @@ mod tests {
let all_subsystems = let all_subsystems =
AllSubsystems::<()>::dummy().replace_collation_generation(ForwardSubsystem(sub_tx)); AllSubsystems::<()>::dummy().replace_collation_generation(ForwardSubsystem(sub_tx));
let (overseer, handler) = Overseer::new( let (overseer, handle) = Overseer::new(
Vec::new(), Vec::new(),
all_subsystems, all_subsystems,
None, None,
@@ -420,7 +420,7 @@ mod tests {
runtime_api: client.clone(), runtime_api: client.clone(),
block_status: client.clone(), block_status: client.clone(),
announce_block: Arc::new(announce_block), announce_block: Arc::new(announce_block),
overseer_handle: handler, overseer_handle: OverseerHandle::Connected(handle),
spawner, spawner,
para_id, para_id,
key: CollatorPair::generate().0, key: CollatorPair::generate().0,
+4 -4
View File
@@ -125,9 +125,9 @@ where
import_queue, import_queue,
task_manager, task_manager,
overseer_handle: relay_chain_full_node overseer_handle: relay_chain_full_node
.overseer_handler .overseer_handle
.clone() .clone()
.ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?, .ok_or_else(|| "Polkadot full node did not provide an `OverseerHandle`!")?,
_phantom: PhantomData, _phantom: PhantomData,
})?; })?;
@@ -136,9 +136,9 @@ where
block_status, block_status,
announce_block, announce_block,
overseer_handle: relay_chain_full_node overseer_handle: relay_chain_full_node
.overseer_handler .overseer_handle
.clone() .clone()
.ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?, .ok_or_else(|| "Polkadot full node did not provide an `OverseerHandle`!")?,
spawner, spawner,
para_id, para_id,
key: relay_chain_full_node.collator_key.clone(), key: relay_chain_full_node.collator_key.clone(),