resolve revoking TODO

node/network/bridge/src/validator_discovery.rs

@@ -103,15 +103,11 @@ impl PendingConnectionRequestState {
 		let _ = self.pending.remove(authority);
 	}
 
-	pub fn is_fulfilled(&mut self) -> bool {
-		self.sender.is_closed() && self.revoke.try_recv().is_err()
-	}
-
 	/// Returns `true` if the request is revoked.
 	pub fn is_revoked(&mut self) -> bool {
 		self.revoke
 			.try_recv()
-			.map_or(false, |r| r.is_some())
+			.map_or(true, |r| r.is_some())
 	}
 
 	pub fn requested(&self) -> &[AuthorityDiscoveryId] {
@@ -224,8 +220,8 @@ impl<N: Network, AD: AuthorityDiscovery> Service<N, AD> {
 			}
 		}
 
-		// clean up revoked and fulfilled requests
-		let mut revoked_or_fulfilled_indexes = Vec::new();
+		// clean up revoked requests
+		let mut revoked_indices = Vec::new();
 		let mut revoked_validators = Vec::new();
 		for (i, pending) in self.pending_discovery_requests.iter_mut().enumerate() {
 			if pending.is_revoked() {
@@ -234,14 +230,12 @@ impl<N: Network, AD: AuthorityDiscovery> Service<N, AD> {
 						revoked_validators.push(id);
 					}
 				}
-				revoked_or_fulfilled_indexes.push(i);
-			} else if pending.is_fulfilled() {
-				revoked_or_fulfilled_indexes.push(i)
+				revoked_indices.push(i);
 			}
 		}
 
 		// clean up pending requests states
-		for to_revoke in revoked_or_fulfilled_indexes.into_iter().rev() {
+		for to_revoke in revoked_indices.into_iter().rev() {
 			drop(self.pending_discovery_requests.swap_remove(to_revoke));
 		}
 

node/subsystem/src/messages.rs

@@ -200,6 +200,8 @@ pub enum NetworkBridgeMessage {
 	///
 	/// Also ask the network to stay connected to these peers at least
 	/// until the request is revoked.
+	///
+	/// NOTE: dropping the revoke's sender will revoke the request.
 	ConnectToValidators {
 		/// Ids of the validators to connect to.
 		validator_ids: Vec<AuthorityDiscoveryId>,
@@ -212,10 +214,7 @@ pub enum NetworkBridgeMessage {
 		/// It doesn't necessarily lead to peers disconnection though.
 		/// The revokation is enacted on in the next connection request.
 		///
-		/// This can be done by sending to the channel.
-		/// NOTE: if the revoke's sender is dropped instead,
-		/// we will never disconnect from the given validator list.
-		// TODO (ordian): will we ever want such behavior?
+		/// This can be done by sending to the channel or dropping the sender.
 		revoke: oneshot::Receiver<()>,
 	},
 }