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

possible improvement to picking best relays

Browse Source
This commit is contained in:
Mike Dilger 2023-09-24 13:58:54 +13:00
parent ad499f565d
commit f2dded420e
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/mod.rs
View File

@ -1820,15 +1820,10 @@ impl Storage {
let num_relays_per_person = self.read_setting_num_relays_per_person() as usize;
// If we can't get enough of them, extend with some of our relays
// at whatever the lowest score of their last one was
// If we can't get enough of them, extend with some of our relays at score=2
if ranked_relays.len() < (num_relays_per_person + 1) {
let how_many_more = (num_relays_per_person + 1) - ranked_relays.len();
let last_score = if ranked_relays.is_empty() {
20
} else {
ranked_relays[ranked_relays.len() - 1].1
};
let score = 2;
match dir {
Direction::Write => {
// substitute our read relays
@ -1839,7 +1834,7 @@ impl Storage {
&& r.has_usage_bits(Relay::READ)
})?
.iter()
.map(|r| (r.url.clone(), last_score))
.map(|r| (r.url.clone(), score))
.take(how_many_more)
.collect();
@ -1854,7 +1849,7 @@ impl Storage {
&& r.has_usage_bits(Relay::WRITE)
})?
.iter()
.map(|r| (r.url.clone(), last_score))
.map(|r| (r.url.clone(), score))
.take(how_many_more)
.collect();

9
src/storage/types/person_relay1.rs
View File

@ -100,11 +100,6 @@ impl PersonRelay1 {
output.sort_by(|(_, score1), (_, score2)| score2.cmp(score1));
// prune everything below a score of 20, but only after the first 6 entries
while output.len() > 6 && output[output.len() - 1].1 < 20 {
let _ = output.pop();
}
output
}
@ -158,10 +153,6 @@ impl PersonRelay1 {
output.sort_by(|(_, score1), (_, score2)| score2.cmp(score1));
// prune everything below a score 20, but only after the first 6 entries
while output.len() > 6 && output[output.len() - 1].1 < 20 {
let _ = output.pop();
}
output
}
}