diff options
Diffstat (limited to 'src/federation/vote.rs')
| -rw-r--r-- | src/federation/vote.rs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/federation/vote.rs b/src/federation/vote.rs index d4968be..1b4de16 100644 --- a/src/federation/vote.rs +++ b/src/federation/vote.rs @@ -144,7 +144,7 @@ fn proposed(seen: &Seen<'_>, current: &Version) -> Vec<Proposed> { /// Whether the node backs `version`, proposed `proposed_held` ago, by the voters' rule: one /// naming a checkpoint only where it changes nothing of `current` but its number, what it /// changes and its checkpoint, and its heads leave out nothing the node held for a while -/// before it was proposed. +/// before it was proposed, proposals and votes aside, which lapse with the move. pub(crate) fn backs_checkpoint( seen: &Seen<'_>, rules: &Rules, @@ -161,11 +161,21 @@ pub(crate) fn backs_checkpoint( ); } let before = proposed_held + rules.held_for; + // Proposals and votes lapse with the move: they count no more on the version after. + let lapsing = |id: &Id| { + matches!( + seen.store.get(id).and_then(Event::read_taken), + Some(Event::Signed(Signed { + does: Does::Proposal { .. } | Does::Vote { .. }, + .. + })) + ) + }; let held: Vec<Id> = seen .store .taken() .iter() - .filter(|id| (seen.held)(id).is_some_and(|held| held >= before)) + .filter(|id| (seen.held)(id).is_some_and(|held| held >= before) && !lapsing(id)) .copied() .collect(); let left_out = seen.store.left_out(heads, &held); |
