aboutsummaryrefslogtreecommitdiffstats
path: root/src/federation/harness.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/federation/harness.rs')
-rw-r--r--src/federation/harness.rs27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/federation/harness.rs b/src/federation/harness.rs
index 4baf049..f14736d 100644
--- a/src/federation/harness.rs
+++ b/src/federation/harness.rs
@@ -5,6 +5,7 @@ use ed25519_dalek::SigningKey;
use super::event;
use super::jcs::Json;
+use super::revision::Revision;
use super::store::Id;
use crate::access::sshsig::PublicKey;
@@ -25,13 +26,21 @@ pub(crate) fn key_line(seed: u8) -> String {
.line()
}
-/// A node ID made from a seed.
+/// A node's key made from a seed.
+pub(crate) fn node_key(seed: u8) -> SigningKey {
+ SigningKey::from_bytes(&[seed.wrapping_add(128); 32])
+}
+
+/// A node ID made from a seed: `node_key`'s.
pub(crate) fn node_id(seed: u8) -> String {
- crate::identity::node_id_of(
- &SigningKey::from_bytes(&[seed.wrapping_add(128); 32])
- .verifying_key()
- .to_bytes(),
- )
+ crate::identity::node_id_of(&node_key(seed).verifying_key().to_bytes())
+}
+
+/// A merge event the node of `seed` signs for `party`, on `deps`.
+pub(crate) fn merge(party: &str, seed: u8, deps: &[Id]) -> Vec<u8> {
+ let key = node_key(seed);
+ let line = PublicKey(key.verifying_key().to_bytes()).line();
+ event::signed(&key, party, &line, deps, event::merge())
}
pub(crate) fn str(text: &str) -> Json {
@@ -127,6 +136,8 @@ pub(crate) struct Spec {
pub(crate) number: u64,
pub(crate) changes: Option<Id>,
pub(crate) parties: Vec<SpecParty>,
+ /// The revision it follows: named where it isn't the base revision.
+ pub(crate) revision: Revision,
/// Each rule: its path and its writer.
pub(crate) rules: Vec<(String, Json)>,
pub(crate) checkpoint: Option<Vec<Id>>,
@@ -139,6 +150,7 @@ impl Spec {
Spec {
number: 0,
changes: None,
+ revision: Revision::default(),
parties: parties
.iter()
.enumerate()
@@ -241,6 +253,9 @@ impl Spec {
if let Some(heads) = &self.checkpoint {
members.push(("checkpoint", ids(heads)));
}
+ if self.revision != Revision::default() {
+ members.push(("revision", str(&self.revision.id().to_string())));
+ }
object(members)
}