validator_discovery: less flexible, but simpler design (#3052)

* validator_discovery: less flexible, but simpler design

* fix test

* remove unused struct

* smol optimization
This commit is contained in:
Andronik Ordian
2021-05-19 18:54:13 +02:00
committed by GitHub
parent 44c03a3633
commit 98c06f5b57
7 changed files with 84 additions and 422 deletions
@@ -36,7 +36,6 @@ use requester::Requester;
/// Handing requests for PoVs during backing.
mod pov_requester;
use pov_requester::PoVRequester;
/// Responding to erasure chunk requests:
mod responder;
@@ -90,7 +89,6 @@ impl AvailabilityDistributionSubsystem {
Context: SubsystemContext<Message = AvailabilityDistributionMessage> + Sync + Send,
{
let mut requester = Requester::new(self.metrics.clone()).fuse();
let mut pov_requester = PoVRequester::new();
loop {
let action = {
let mut subsystem_next = ctx.recv().fuse();
@@ -113,18 +111,6 @@ impl AvailabilityDistributionSubsystem {
};
match message {
FromOverseer::Signal(OverseerSignal::ActiveLeaves(update)) => {
let result = pov_requester.update_connected_validators(
&mut ctx,
&mut self.runtime,
&update,
).await;
if let Err(error) = result {
tracing::debug!(
target: LOG_TARGET,
?error,
"PoVRequester::update_connected_validators",
);
}
log_error(
requester.get_mut().update_fetching_heads(&mut ctx, &mut self.runtime, update).await,
"Error in Requester::update_fetching_heads"
@@ -154,7 +140,7 @@ impl AvailabilityDistributionSubsystem {
},
} => {
log_error(
pov_requester.fetch_pov(
pov_requester::fetch_pov(
&mut ctx,
&mut self.runtime,
relay_parent,
@@ -163,7 +149,7 @@ impl AvailabilityDistributionSubsystem {
pov_hash,
tx,
).await,
"PoVRequester::fetch_pov"
"pov_requester::fetch_pov"
)?;
}
}