aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/event.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/event.rs')
-rw-r--r--src/federation/event.rs16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/federation/event.rs b/src/federation/event.rs
index 864bedb..ec4493f 100644
--- a/src/federation/event.rs
+++ b/src/federation/event.rs
@@ -81,6 +81,11 @@ pub(crate) fn vote(on: Id, proposal: Id, yes: bool) -> (&'static str, Json) {
("vote", does.expect("names once each"))
}
+/// What a node writing a merge event does: nothing but build on its dependencies.
+pub(crate) fn merge() -> (&'static str, Json) {
+ ("merge", Json::Bool(true))
+}
+
/// A version event, which nobody signs: its bytes.
pub(crate) fn version_event(deps: &[Id], version: Id) -> Vec<u8> {
Json::object(vec![
@@ -135,6 +140,9 @@ pub(crate) enum Does {
Proposal { hash: Id, version: Json },
/// A vote on a proposal (`proposal`) on a version (`on`).
Vote { on: Id, proposal: Id, yes: bool },
+ /// Nothing but building on its dependencies, signed by a node its party lists, with
+ /// its node key (`revision::Feature::MergeEvents`).
+ Merge,
}
impl Event {
@@ -166,7 +174,7 @@ impl Event {
let version = Id::from_hex(json.get("version")?.as_str()?)?;
return Some(Event::Version { deps, version });
}
- let does = ["write", "keys", "nodes", "proposal", "vote"]
+ let does = ["write", "keys", "nodes", "proposal", "vote", "merge"]
.into_iter()
.find(|name| names.contains(name))?;
let mut expected = vec!["deps", "key", "party", "sig", does];
@@ -213,6 +221,12 @@ impl Event {
hash: Id::of(&what.bytes()),
version: what.clone(),
},
+ "merge" => {
+ if what.as_bool() != Some(true) {
+ return None;
+ }
+ Does::Merge
+ }
_ => {
if what.names() != ["on", "proposal", "yes"] {
return None;