Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Allow using any polkadot client instead of enum Client #1575

Merged
15 commits merged into from
Aug 13, 2020
Merged

Allow using any polkadot client instead of enum Client #1575

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ac4e6c4
WIP
cecton Aug 12, 2020
5527eaa
WIP
cecton Aug 12, 2020
47f184e
WIP
cecton Aug 12, 2020
f60375c
WIP
cecton Aug 12, 2020
99bbf74
WIP
cecton Aug 12, 2020
43512e8
WIP
cecton Aug 12, 2020
ae7082c
WIP
cecton Aug 12, 2020
fb78f0b
WIP
cecton Aug 12, 2020
846e23f
Apply suggestions from code review
cecton Aug 12, 2020
5caaaeb
WIP
cecton Aug 13, 2020
0070028
WIP
cecton Aug 13, 2020
b66861c
WIP
cecton Aug 13, 2020
96cdf51
CLEANUP
cecton Aug 13, 2020
5c4f5ca
link in doc
cecton Aug 13, 2020
12cbf02
doc
cecton Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP 
Forked at: e916423
Parent branch: origin/rococo-branch
  • Loading branch information
@cecton
cecton committed Aug 12, 2020
commit 47f184ea127d37f8a0f5ba821b34abf9e2455c46
9 changes: 4 additions & 5 deletions collator/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub use sc_network::PeerId;
pub use service::{RuntimeApiCollection, Client};
pub use sc_cli::SubstrateCli;
#[cfg(not(feature = "service-rewr"))]
use polkadot_service::{FullNodeHandles, AbstractClient};
use polkadot_service::{FullNodeHandles, AbstractClient, YaExecuteWithClient};
#[cfg(feature = "service-rewr")]
use polkadot_service_new::{
self as polkadot_service,
Expand All @@ -77,8 +77,7 @@ use sc_service::SpawnTaskHandle;
use sp_core::traits::SpawnNamed;
use sp_runtime::traits::{Block as BlockT, BlakeTwo256};
Comment thread
cecton marked this conversation as resolved.
Outdated
use consensus_common::SyncOracle;
use sc_client_api::{Backend as BackendT, BlockchainEvents};
use sp_blockchain::HeaderBackend;
use sc_client_api::Backend as BackendT;

const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);

Expand Down Expand Up @@ -206,7 +205,7 @@ pub async fn collate<P>(
fn build_collator_service<P>(
spawner: SpawnTaskHandle,
handles: FullNodeHandles,
client: polkadot_service::Client,
client: impl YaExecuteWithClient,
para_id: ParaId,
key: Arc<CollatorPair>,
build_parachain_context: P,
Expand Down Expand Up @@ -357,7 +356,7 @@ impl<P> polkadot_service::ExecuteWithClient for BuildCollationWork<P>
fn build_collator_service<P>(
spawner: SpawnTaskHandle,
handles: FullNodeHandles,
client: polkadot_service::Client,
client: impl polkadot_service::YaExecuteWithClient,
para_id: ParaId,
key: Arc<CollatorPair>,
build_parachain_context: P,
Expand Down