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.rs56
1 files changed, 8 insertions, 48 deletions
diff --git a/src/federation/harness.rs b/src/federation/harness.rs
index 6d1b214..80328dd 100644
--- a/src/federation/harness.rs
+++ b/src/federation/harness.rs
@@ -3,8 +3,8 @@
use ed25519_dalek::SigningKey;
+use super::event;
use super::jcs::Json;
-use super::keys;
use super::store::Id;
use crate::access::sshsig::PublicKey;
@@ -78,18 +78,7 @@ impl Party {
deps: &[Id],
does: (&str, Json),
) -> Vec<u8> {
- let unsigned = object(vec![
- ("deps", ids(deps)),
- ("party", str(&self.name)),
- ("key", str(key)),
- (does.0, does.1),
- ]);
- let sig = keys::sign(signer, &unsigned.bytes());
- let Json::Object(mut members) = unsigned else {
- unreachable!("an object")
- };
- members.push(("sig".to_owned(), Json::Str(sig)));
- Json::object(members).expect("names once each").bytes()
+ event::signed(signer, &self.name, key, deps, does)
}
pub(crate) fn sign(&self, deps: &[Id], does: (&str, Json)) -> Vec<u8> {
@@ -97,58 +86,29 @@ impl Party {
}
pub(crate) fn write(&self, deps: &[Id], path: &str, value: Json) -> Vec<u8> {
- self.sign(
- deps,
- ("write", object(vec![("path", str(path)), ("value", value)])),
- )
+ self.sign(deps, event::write(path, value))
}
pub(crate) fn keys(&self, deps: &[Id], keys: &[String]) -> Vec<u8> {
- self.sign(
- deps,
- (
- "keys",
- Json::Array(keys.iter().map(|key| str(key)).collect()),
- ),
- )
+ self.sign(deps, event::keys(keys))
}
pub(crate) fn nodes(&self, deps: &[Id], nodes: &[String]) -> Vec<u8> {
- self.sign(
- deps,
- (
- "nodes",
- Json::Array(nodes.iter().map(|id| str(id)).collect()),
- ),
- )
+ self.sign(deps, event::nodes(nodes))
}
pub(crate) fn propose(&self, deps: &[Id], version: &Json) -> Vec<u8> {
- self.sign(deps, ("proposal", version.clone()))
+ self.sign(deps, event::proposal(version))
}
pub(crate) fn vote(&self, deps: &[Id], on: Id, proposal: Id, yes: bool) -> Vec<u8> {
- self.sign(
- deps,
- (
- "vote",
- object(vec![
- ("on", str(&on.to_string())),
- ("proposal", str(&proposal.to_string())),
- ("yes", Json::Bool(yes)),
- ]),
- ),
- )
+ self.sign(deps, event::vote(on, proposal, yes))
}
}
/// A version event, which nobody signs.
pub(crate) fn version_event(deps: &[Id], version: Id) -> Vec<u8> {
- object(vec![
- ("deps", ids(deps)),
- ("version", str(&version.to_string())),
- ])
- .bytes()
+ event::version_event(deps, version)
}
/// What a version gives a party, as a test spells it out.