aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/held.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/held.rs')
-rw-r--r--src/federation/held.rs29
1 files changed, 21 insertions, 8 deletions
diff --git a/src/federation/held.rs b/src/federation/held.rs
index 6e00e51..9c87995 100644
--- a/src/federation/held.rs
+++ b/src/federation/held.rs
@@ -29,7 +29,7 @@ use anyhow::{Context, Result, bail};
use serde::{Deserialize, Serialize};
use tracing::{error, info, warn};
-use super::client::Record;
+use super::client::{self, Record};
use super::event::{self, Does, Event, Signed};
use super::fold::Federation;
use super::revision::Feature;
@@ -740,11 +740,14 @@ impl Holding {
yes,
nays,
} => {
- // On the events proposing it, those above the heads it names for a
- // checkpoint, so a version event may be written on it, which the
- // node's heads, holding what is beside them, may not be.
- let proposing = store.state().proposing(&current.hash, &proposal);
- if proposing.is_empty() {
+ // On an event proposing it, of a checkpoint one above the heads it
+ // names, so a version event may be written on it, which the node's
+ // heads, holding what is beside them, may not be; and on the nays that
+ // freed its party (`client::building`).
+ let state = store.state();
+ let Some(proposing) =
+ state.proposing(&current.hash, &proposal).first().copied()
+ else {
if hand.is_some() {
return Err(format!(
"no event proposing {proposal} is above the heads it names: \
@@ -752,12 +755,22 @@ impl Holding {
));
}
continue;
- }
+ };
+ let checkpoint = state
+ .proposal(&proposal)
+ .and_then(|json| Version::read(json).ok())
+ .and_then(|version| version.checkpoint)
+ .is_some();
+ let on = match client::building(proposing, checkpoint, &nays) {
+ Ok(on) => on,
+ Err(why) if hand.is_some() => return Err(why),
+ Err(_) => continue,
+ };
let cast = event::signed(
&voter.key,
party,
&line,
- &proposing,
+ &on,
event::vote(current.hash, proposal, yes),
);
record.cast(&current, &cast, nays);