aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/model.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/model.rs')
-rw-r--r--src/federation/model.rs40
1 files changed, 28 insertions, 12 deletions
diff --git a/src/federation/model.rs b/src/federation/model.rs
index 8cd189b..cfe787d 100644
--- a/src/federation/model.rs
+++ b/src/federation/model.rs
@@ -7,6 +7,8 @@ use std::collections::{BTreeMap, BTreeSet};
use super::event::{Checkpoint, Does, Event, Signed};
use super::jcs::Json;
+use super::keys;
+use super::revision::Feature;
use super::store::Id;
use super::version::Version;
@@ -259,6 +261,23 @@ impl Model {
}
}
+ /// The node list of `party` in a history by `version`.
+ fn nodes(&self, history: &BTreeSet<Id>, party: &str, version: &Version) -> Vec<String> {
+ let Some(given) = version.parties.get(party) else {
+ return Vec::new();
+ };
+ match self
+ .list(history, party, version, false)
+ .map(|id| &self.taken[&id])
+ {
+ Some(Event::Signed(Signed {
+ does: Does::Nodes(nodes),
+ ..
+ })) => nodes.clone(),
+ _ => given.nodes.clone(),
+ }
+ }
+
/// The parties voting `true`, and `false`, on a proposal on `on` in a history.
fn votes(
&self,
@@ -328,6 +347,13 @@ impl Model {
&& current.writer(path) == Some(signed.party.as_str())
}
Does::Keys(_) | Does::Nodes(_) | Does::Proposal { .. } => by_version,
+ // Signed by a node its party lists, under a revision taking them.
+ Does::Merge => {
+ current.revision.has(Feature::MergeEvents)
+ && keys::node_of(&Event::public(signed)).is_some_and(|node| {
+ self.nodes(history, &signed.party, &current).contains(&node)
+ })
+ }
Does::Vote { on, proposal, yes } => {
by_version
&& *on == current.hash
@@ -501,18 +527,8 @@ impl Model {
let all = self.taken();
let current = self.version();
let mut members = BTreeSet::new();
- for (party, given) in &current.parties {
- let nodes = match self
- .list(&all, party, &current, false)
- .map(|id| &self.taken[&id])
- {
- Some(Event::Signed(Signed {
- does: Does::Nodes(nodes),
- ..
- })) => nodes.clone(),
- _ => given.nodes.clone(),
- };
- for node in nodes {
+ for party in current.parties.keys() {
+ for node in self.nodes(&all, party, &current) {
members.insert((node, party.clone()));
}
}