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

Commit

Permalink
PVF: Fix external workers being required for non-collator full nodes (#…
Browse files Browse the repository at this point in the history
…7566)

* PVF: Fix external workers being required for non-collator full nodes

* Fix

* Make check more precise

> This might as well be if role.is_authority() as there aren't really any nodes
> that are both authorities and collators. But if there were a node that is an
> authority and a collator, it'd probably want to validate candidates (in its
> role as an authority).

* Just seeing if this fixes zombienet CI...
  • Loading branch information
mrcnski authored Aug 1, 2023
1 parent 5303d8c commit 762f573
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
11 changes: 0 additions & 11 deletions cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@ pub enum Subcommand {
ChainInfo(sc_cli::ChainInfoCmd),
}

#[allow(missing_docs)]
#[derive(Debug, Parser)]
pub struct ValidationWorkerCommand {
/// The path to the validation host's socket.
#[arg(long)]
pub socket_path: String,
/// Calling node implementation version
#[arg(long)]
pub node_impl_version: String,
}

#[allow(missing_docs)]
#[derive(Debug, Parser)]
#[group(skip)]
Expand Down
6 changes: 3 additions & 3 deletions node/service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -909,9 +909,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
slot_duration_millis: slot_duration.as_millis() as u64,
};

let candidate_validation_config = if is_collator.is_collator() {
None
} else {
let candidate_validation_config = if role.is_authority() && !is_collator.is_collator() {
let (prep_worker_path, exec_worker_path) =
workers::determine_workers_paths(workers_path, workers_names, node_version.clone())?;
log::info!("🚀 Using prepare-worker binary at: {:?}", prep_worker_path);
Expand All @@ -927,6 +925,8 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
prep_worker_path,
exec_worker_path,
})
} else {
None
};

let chain_selection_config = ChainSelectionConfig {
Expand Down

0 comments on commit 762f573

Please sign in to comment.