nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-29 16:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow picking relays at max, but only from existing connected relays

Browse Source
This commit is contained in:
Mike Dilger 2023-02-08 19:40:36 +13:00
parent b362302707
commit e1ecdd9ac8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/relays.rs
View File

@ -34,9 +34,6 @@ pub enum RelayPickFailure {
/// No progress was made. A stuck result.
NoProgress,
/// Maximum relays picked
MaxConnectedRelays,
}
impl fmt::Display for RelayPickFailure {
@ -44,9 +41,6 @@ impl fmt::Display for RelayPickFailure {
match *self {
RelayPickFailure::NoPeopleLeft => write!(f, "All people accounted for."),
RelayPickFailure::NoProgress => write!(f, "Unable to make further progress."),
RelayPickFailure::MaxConnectedRelays => {
write!(f, "We have hit the maximum number of connected relays")
}
}
}
}
@ -172,11 +166,10 @@ impl RelayTracker {
/// Create the next assignment, and return the RelayUrl that has it.
/// The caller is responsible for making that assignment actually happen.
pub async fn pick(&self) -> Result<RelayUrl, RelayPickFailure> {
// Maybe we hit max
// If we are at max relays, only consider relays we are already
// connected to
let max_relays = GLOBALS.settings.read().await.max_relays as usize;
if self.relay_assignments.len() >= max_relays {
return Err(RelayPickFailure::MaxConnectedRelays);
}
let at_max_relays = self.relay_assignments.len() >= max_relays;
// Maybe include excluded relays
let now = Unixtime::now().unwrap().0;
@ -215,6 +208,11 @@ impl RelayTracker {
continue;
}
// If at max, skip relays not already connected
if at_max_relays && !self.connected_relays.contains(relay) {
continue;
}
// Skip if relay is already assigned this pubkey
if let Some(assignment) = self.relay_assignments.get(relay) {
if assignment.pubkeys.contains(pubkeyhex) {