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

Revert enabling authority discovery by default #1532

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Revert enabling authority discovery by default #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf8234
revert enabling authority discovery by default
andresilva Aug 4, 2020
3bd081b
Merge branch 'master' into andre/disable-authority-discovery
andresilva Aug 4, 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
9 changes: 3 additions & 6 deletions cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ pub struct RunCmd {
#[structopt(long = "force-westend")]
pub force_westend: bool,

/// Disable the authority discovery module on validator or sentry nodes.
///
/// Enabled by default on validator and sentry nodes. Always disabled on
/// non validator or sentry nodes.
/// Enable the authority discovery module on validator or sentry nodes.
///
/// When enabled:
///
Expand All @@ -73,8 +70,8 @@ pub struct RunCmd {
/// (2) As a validator or sentry node: Discover addresses of validators or
/// addresses of their sentry nodes and maintain a permanent connection
/// to a subset.
#[structopt(long = "disable-authority-discovery")]
pub authority_discovery_disabled: bool,
#[structopt(long = "enable-authority-discovery")]
pub authority_discovery_enabled: bool,

/// Setup a GRANDPA scheduled voting pause.
///
Expand Down
4 changes: 2 additions & 2 deletions cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub fn run() -> Result<()> {

set_default_ss58_version(chain_spec);

let authority_discovery_disabled = cli.run.authority_discovery_disabled;
let authority_discovery_enabled = cli.run.authority_discovery_enabled;
let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
None
} else {
Expand All @@ -138,7 +138,7 @@ pub fn run() -> Result<()> {
config,
None,
None,
authority_discovery_disabled,
authority_discovery_enabled,
6000,
grandpa_pause,
).map(|r| r.0),
Expand Down
14 changes: 7 additions & 7 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ fn new_full<RuntimeApi, Executor>(
mut config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
_max_block_data_size: Option<u64>,
_authority_discovery_disabled: bool,
_authority_discovery_enabled: bool,
_slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand Down Expand Up @@ -644,7 +644,7 @@ pub fn polkadot_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -662,7 +662,7 @@ pub fn polkadot_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand All @@ -676,7 +676,7 @@ pub fn kusama_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand All @@ -694,7 +694,7 @@ pub fn kusama_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand All @@ -708,7 +708,7 @@ pub fn westend_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -726,7 +726,7 @@ pub fn westend_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand Down
8 changes: 4 additions & 4 deletions node/test-service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn polkadot_test_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
) -> Result<
(
Expand All @@ -79,7 +79,7 @@ pub fn polkadot_test_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
None,
true,
Expand Down Expand Up @@ -198,9 +198,9 @@ pub fn run_test_node(
> {
let config = node_config(storage_update_func, task_executor, key, boot_nodes);
let multiaddr = config.network.listen_addresses[0].clone();
let authority_discovery_disabled = true;
let authority_discovery_enabled = false;
let (task_manager, client, handles, network, rpc_handlers) =
polkadot_test_new_full(config, None, None, authority_discovery_disabled, 6000)
polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)
.expect("could not create Polkadot test service");

let peer_id = network.local_peer_id().clone();
Expand Down
30 changes: 15 additions & 15 deletions service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ pub fn new_full<RuntimeApi, Executor>(
mut config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
test: bool,
Expand Down Expand Up @@ -453,7 +453,7 @@ pub fn new_full<RuntimeApi, Executor>(
}

if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
if !authority_discovery_disabled {
if authority_discovery_enabled {
let (sentries, authority_discovery_role) = match role {
Role::Authority { ref sentry_nodes } => (
sentry_nodes.clone(),
Expand Down Expand Up @@ -690,7 +690,7 @@ pub fn polkadot_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -704,7 +704,7 @@ pub fn polkadot_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -719,7 +719,7 @@ pub fn kusama_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand All @@ -732,7 +732,7 @@ pub fn kusama_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -747,7 +747,7 @@ pub fn westend_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -761,7 +761,7 @@ pub fn westend_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -776,7 +776,7 @@ pub fn rococo_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -790,7 +790,7 @@ pub fn rococo_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand Down Expand Up @@ -829,7 +829,7 @@ pub fn build_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(TaskManager, Client, FullNodeHandles), ServiceError> {
Expand All @@ -838,7 +838,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -848,7 +848,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -858,7 +858,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -868,7 +868,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand Down