diff options
Diffstat (limited to 'src/federation/model.rs')
| -rw-r--r-- | src/federation/model.rs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/federation/model.rs b/src/federation/model.rs index 2107d9f..8cd189b 100644 --- a/src/federation/model.rs +++ b/src/federation/model.rs @@ -205,7 +205,8 @@ impl Model { }) } - /// The key set, or node list, of `party` that counts in a history by `version`. + /// The key set, or node list, of `party` that counts in a history by `version`: of + /// those written under the latest version, the latest. fn list( &self, history: &BTreeSet<Id>, @@ -219,17 +220,23 @@ impl Model { } else { given.nodes_since }; - let ids: Vec<Id> = self + let ids: Vec<(Id, u64)> = self .signed(history) - .filter(|(id, signed)| { + .filter(|(_, signed)| { signed.party == party && match signed.does { Does::Keys(_) => keys, Does::Nodes(_) => !keys, _ => false, } - && self.under(id).is_some_and(|under| under.number >= since) }) + .filter_map(|(id, _)| Some((id, self.under(&id)?.number))) + .filter(|(_, number)| *number >= since) + .collect(); + let latest = ids.iter().map(|(_, number)| *number).max()?; + let ids: Vec<Id> = ids + .into_iter() + .filter(|(_, number)| *number == latest) .map(|(id, _)| id) .collect(); self.latest(&ids) |
