pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-30 15:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert enabling authority discovery by default (#1532)

Browse Source
This commit is contained in:
André Silva
2020-08-05 13:10:43 +01:00
committed by GitHub
parent f554868cd4
commit a7b6c91f80
5 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/cli/src/cli.rs
+3 -6
View File
@@ -59,10 +59,7 @@ pub struct RunCmd {
#[structopt(long = "force-westend")] #[structopt(long = "force-westend")]
pub force_westend: bool, pub force_westend: bool,
/// Disable the authority discovery module on validator or sentry nodes. /// Enable 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.
/// ///
/// When enabled: /// When enabled:
/// ///
@@ -73,8 +70,8 @@ pub struct RunCmd {
/// (2) As a validator or sentry node: Discover addresses of validators or /// (2) As a validator or sentry node: Discover addresses of validators or
/// addresses of their sentry nodes and maintain a permanent connection /// addresses of their sentry nodes and maintain a permanent connection
/// to a subset. /// to a subset.
#[structopt(long = "disable-authority-discovery")] #[structopt(long = "enable-authority-discovery")]
pub authority_discovery_disabled: bool, pub authority_discovery_enabled: bool,
/// Setup a GRANDPA scheduled voting pause. /// Setup a GRANDPA scheduled voting pause.
/// ///
polkadot/cli/src/command.rs
+2 -2
View File
@@ -114,7 +114,7 @@ pub fn run() -> Result<()> {
set_default_ss58_version(chain_spec); 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() { let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
None None
} else { } else {
@@ -138,7 +138,7 @@ pub fn run() -> Result<()> {
config, config,
None, None,
None, None,
authority_discovery_disabled, authority_discovery_enabled,
6000, 6000,
grandpa_pause, grandpa_pause,
).map(|r| r.0), ).map(|r| r.0),
polkadot/node/service/src/lib.rs
+7 -7
View File
@@ -301,7 +301,7 @@ fn new_full<RuntimeApi, Executor>(
mut config: Configuration, mut config: Configuration,
collating_for: Option<(CollatorId, ParaId)>, collating_for: Option<(CollatorId, ParaId)>,
_max_block_data_size: Option<u64>, _max_block_data_size: Option<u64>,
_authority_discovery_disabled: bool, _authority_discovery_enabled: bool,
_slot_duration: u64, _slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) -> Result<( ) -> Result<(
@@ -644,7 +644,7 @@ pub fn polkadot_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, ParaId)>, collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) )
@@ -662,7 +662,7 @@ pub fn polkadot_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
)?; )?;
@@ -676,7 +676,7 @@ pub fn kusama_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, ParaId)>, collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) -> Result<( ) -> Result<(
@@ -694,7 +694,7 @@ pub fn kusama_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
)?; )?;
@@ -708,7 +708,7 @@ pub fn westend_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, ParaId)>, collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) )
@@ -726,7 +726,7 @@ pub fn westend_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
)?; )?;
polkadot/node/test-service/src/lib.rs
+4 -4
View File
@@ -62,7 +62,7 @@ pub fn polkadot_test_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, ParaId)>, collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
) -> Result< ) -> Result<
( (
@@ -79,7 +79,7 @@ pub fn polkadot_test_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
None, None,
true, true,
@@ -198,9 +198,9 @@ pub fn run_test_node(
> { > {
let config = node_config(storage_update_func, task_executor, key, boot_nodes); let config = node_config(storage_update_func, task_executor, key, boot_nodes);
let multiaddr = config.network.listen_addresses[0].clone(); 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) = 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"); .expect("could not create Polkadot test service");
let peer_id = network.local_peer_id().clone(); let peer_id = network.local_peer_id().clone();
polkadot/service/src/lib.rs
+15 -15
View File
@@ -250,7 +250,7 @@ pub fn new_full<RuntimeApi, Executor>(
mut config: Configuration, mut config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
test: bool, test: bool,
@@ -453,7 +453,7 @@ pub fn new_full<RuntimeApi, Executor>(
} }
if matches!(role, Role::Authority{..} | Role::Sentry{..}) { if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
if !authority_discovery_disabled { if authority_discovery_enabled {
let (sentries, authority_discovery_role) = match role { let (sentries, authority_discovery_role) = match role {
Role::Authority { ref sentry_nodes } => ( Role::Authority { ref sentry_nodes } => (
sentry_nodes.clone(), sentry_nodes.clone(),
@@ -690,7 +690,7 @@ pub fn polkadot_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) )
@@ -704,7 +704,7 @@ pub fn polkadot_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -719,7 +719,7 @@ pub fn kusama_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) -> Result<( ) -> Result<(
@@ -732,7 +732,7 @@ pub fn kusama_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -747,7 +747,7 @@ pub fn westend_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) )
@@ -761,7 +761,7 @@ pub fn westend_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -776,7 +776,7 @@ pub fn rococo_new_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) )
@@ -790,7 +790,7 @@ pub fn rococo_new_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -829,7 +829,7 @@ pub fn build_full(
config: Configuration, config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>, collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>, max_block_data_size: Option<u64>,
authority_discovery_disabled: bool, authority_discovery_enabled: bool,
slot_duration: u64, slot_duration: u64,
grandpa_pause: Option<(u32, u32)>, grandpa_pause: Option<(u32, u32)>,
) -> Result<(TaskManager, Client, FullNodeHandles), ServiceError> { ) -> Result<(TaskManager, Client, FullNodeHandles), ServiceError> {
@@ -838,7 +838,7 @@ pub fn build_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -848,7 +848,7 @@ pub fn build_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -858,7 +858,7 @@ pub fn build_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,
@@ -868,7 +868,7 @@ pub fn build_full(
config, config,
collating_for, collating_for,
max_block_data_size, max_block_data_size,
authority_discovery_disabled, authority_discovery_enabled,
slot_duration, slot_duration,
grandpa_pause, grandpa_pause,
false, false,