*: Update authority discovery and remove WorkerConfig

With paritytech/substrate#7545 the authority
discovery module queries and publishes addresses on an exponentially
increasing interval. Doing so should make custom configurations
obsolete, as operations are retried in a timely fashion in the first
minutes.

cli/src/command.rs

@@ -148,7 +148,6 @@ pub fn run() -> Result<()> {
 						config,
 						service::IsCollator::No,
 						grandpa_pause,
-						None,
 					).map(|full| full.task_manager),
 				}
 			})

node/service/src/lib.rs

@@ -33,7 +33,7 @@ use {
 	polkadot_node_core_proposer::ProposerFactory,
 	polkadot_overseer::{AllSubsystems, BlockInfo, Overseer, OverseerHandler},
 	polkadot_primitives::v1::ParachainHost,
-	sc_authority_discovery::{Service as AuthorityDiscoveryService, WorkerConfig as AuthorityWorkerConfig},
+	sc_authority_discovery::Service as AuthorityDiscoveryService,
 	sp_blockchain::HeaderBackend,
 	sp_core::traits::SpawnNamed,
 	sp_keystore::SyncCryptoStorePtr,
@@ -478,7 +478,6 @@ pub fn new_full<RuntimeApi, Executor>(
 	mut config: Configuration,
 	is_collator: IsCollator,
 	grandpa_pause: Option<(u32, u32)>,
-	authority_discovery_config: Option<AuthorityWorkerConfig>,
 	isolation_strategy: IsolationStrategy,
 ) -> Result<NewFull<Arc<FullClient<RuntimeApi, Executor>>>, Error>
 	where
@@ -589,8 +588,7 @@ pub fn new_full<RuntimeApi, Executor>(
 				Event::Dht(e) => Some(e),
 				_ => None,
 			}});
-		let (worker, service) = sc_authority_discovery::new_worker_and_service_with_config(
-			authority_discovery_config.unwrap_or_default(),
+		let (worker, service) = sc_authority_discovery::new_worker_and_service(
 			client.clone(),
 			network.clone(),
 			Box::pin(dht_event_stream),
@@ -910,38 +908,33 @@ pub fn build_full(
 	config: Configuration,
 	is_collator: IsCollator,
 	grandpa_pause: Option<(u32, u32)>,
-	authority_discovery_config: Option<AuthorityWorkerConfig>,
 ) -> Result<NewFull<Client>, Error> {
 	if config.chain_spec.is_rococo() {
 		new_full::<rococo_runtime::RuntimeApi, RococoExecutor>(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Rococo))
 	} else if config.chain_spec.is_kusama() {
 		new_full::<kusama_runtime::RuntimeApi, KusamaExecutor>(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Kusama))
 	} else if config.chain_spec.is_westend() {
 		new_full::<westend_runtime::RuntimeApi, WestendExecutor>(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Westend))
 	} else {
 		new_full::<polkadot_runtime::RuntimeApi, PolkadotExecutor>(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Polkadot))
 	}

node/test/service/src/lib.rs

@@ -82,11 +82,6 @@ pub fn new_full(
 		config,
 		is_collator,
 		None,
-		Some(sc_authority_discovery::WorkerConfig {
-			query_interval: Duration::from_secs(1),
-			query_start_delay: Duration::from_secs(0),
-			..Default::default()
-		}),
 		polkadot_parachain::wasm_executor::IsolationStrategy::InProcess,
 	).map_err(Into::into)
 }

parachain/test-parachains/adder/collator/src/main.rs

@@ -48,11 +48,6 @@ fn main() -> Result<()> {
 					config,
 					polkadot_service::IsCollator::Yes(collator.collator_id()),
 					None,
-					Some(sc_authority_discovery::WorkerConfig {
-						query_interval: Duration::from_secs(1),
-						query_start_delay: Duration::from_secs(0),
-						..Default::default()
-					}),
 				)?;
 				let mut overseer_handler = full_node.overseer_handler
 					.expect("Overseer handler should be initialized for collators");