aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/fold.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/fold.rs')
-rw-r--r--src/federation/fold.rs27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/federation/fold.rs b/src/federation/fold.rs
index 3ebeebf..2e3fc56 100644
--- a/src/federation/fold.rs
+++ b/src/federation/fold.rs
@@ -186,28 +186,35 @@ impl State {
.copied()
}
- /// The key set, or node list, of `party` that counts by `current`: one written under a
- /// version numbered at least the `since` it gives the party's.
+ /// The key set, or node list, of `party` that counts by `current`: of those written
+ /// under a version numbered at least the `since` it gives the party's, those written
+ /// under the latest version, and of those the latest (`latest`). So one a stolen key
+ /// writes at a history from before the version that named its party's keys anew
+ /// replaces nothing the party wrote under that version.
fn list(&self, party: &str, current: &Version, list: List) -> Option<Id> {
let given = current.parties.get(party)?;
let since = match list {
List::Keys => given.keys_since,
List::Nodes => given.nodes_since,
};
- let candidates: Vec<Id> = self
+ let candidates: Vec<(Id, u64)> = self
.signed()
- .filter(|(_, signed, under)| {
- signed.party == party
+ .filter_map(|(id, signed, under)| {
+ let number = self.versions.get(under)?.number;
+ (signed.party == party
&& matches!(
(&signed.does, list),
(Does::Keys(_), List::Keys) | (Does::Nodes(_), List::Nodes)
)
- && self
- .versions
- .get(under)
- .is_some_and(|version| version.number >= since)
+ && number >= since)
+ .then_some((*id, number))
})
- .map(|(id, _, _)| *id)
+ .collect();
+ let latest = candidates.iter().map(|(_, number)| *number).max()?;
+ let candidates: Vec<Id> = candidates
+ .into_iter()
+ .filter(|(_, number)| *number == latest)
+ .map(|(id, _)| id)
.collect();
self.latest(&candidates)
}