diff options
Diffstat (limited to 'src/federation/version.rs')
| -rw-r--r-- | src/federation/version.rs | 73 |
1 files changed, 69 insertions, 4 deletions
diff --git a/src/federation/version.rs b/src/federation/version.rs index 378e122..fa534b3 100644 --- a/src/federation/version.rs +++ b/src/federation/version.rs @@ -5,6 +5,7 @@ use std::collections::{BTreeMap, BTreeSet}; use super::jcs::Json; use super::keys; +use super::revision::Revision; use super::store::Id; /// The federation this is: a version naming another is none here. @@ -31,6 +32,8 @@ pub(crate) struct Version { /// The SHA-256 of its JCS bytes, written as an ID is. pub(crate) hash: Id, pub(crate) json: Json, + /// The revision of the federation it follows: the base revision where it names none. + pub(crate) revision: Revision, pub(crate) number: u64, /// The version it changes; none for the first. pub(crate) changes: Option<Id>, @@ -154,7 +157,7 @@ impl Version { json, "a version", &["federation", "number", "changes", "keys", "nodes", "rules"], - &["checkpoint"], + &["checkpoint", "revision"], )?; match json.get("federation").and_then(Json::as_int) { Some(FEDERATION) => {} @@ -165,6 +168,30 @@ impl Version { } None => return Err("a federation that is no number".to_owned()), } + let revision = match json.get("revision") { + None => Revision::default(), + Some(named) => { + let id = named + .as_str() + .and_then(Id::from_hex) + .ok_or("a `revision` that is no revision's ID")?; + match Revision::of(&id) { + Some(Revision(0)) => { + return Err("a `revision` naming the base revision, which a version \ + names by leaving it out" + .to_owned()); + } + Some(revision) => revision, + None => { + return Err(format!( + "revision {id}, which this continuum doesn't know, as it knows {}: \ + a release that knows it reads this version", + Revision::knowing() + )); + } + } + } + }; let number = json .get("number") .and_then(Json::as_int) @@ -198,6 +225,7 @@ impl Version { Ok(Version { hash: Id::of(&json.bytes()), json: json.clone(), + revision, number, changes, parties, @@ -282,8 +310,9 @@ impl Version { } /// Whether it changes `before` as a version must: numbered one past it, naming its - /// hash, and with each `since` its own number, or that `before` gives the party with - /// the same keys, or node list. The first version gives every party its own. + /// hash, of its revision or a later one, and with each `since` its own number, or that + /// `before` gives the party with the same keys, or node list. The first version gives + /// every party its own. pub(crate) fn changes_validly(&self, before: Option<&Version>) -> Result<(), String> { match before { None => { @@ -303,6 +332,12 @@ impl Version { self.number, before.number )); } + if self.revision < before.revision { + return Err(format!( + "{}, before {} of the version it changes", + self.revision, before.revision + )); + } for (name, party) in &self.parties { let was = before.parties.get(name); let keys_kept = was.is_some_and(|was| { @@ -326,7 +361,7 @@ impl Version { } /// Whether it changes nothing of `before` but its number, what it changes and its - /// checkpoint: one that only moves the store on. + /// checkpoint, its revision neither: one that only moves the store on. pub(crate) fn only_moves_on(&self, before: &Version) -> bool { let strip = |json: &Json| { json.without("number") @@ -559,6 +594,36 @@ mod tests { assert_eq!(why, "97 parties, more than 96"); } + /// A version follows the base revision where it names none; one naming the base + /// revision, or one this continuum doesn't know, is none, and says so. + #[test] + fn a_version_names_a_revision_it_follows_or_none() { + assert_eq!( + Version::read(&first()).expect("a version").revision, + Revision::default() + ); + let named = |id: &str| { + let text = String::from_utf8(first().bytes()).expect("UTF-8"); + let text = text.replacen(r#""rules":"#, &format!(r#""revision":"{id}","rules":"#), 1); + Version::read(&jcs::read(text.as_bytes()).expect("JCS")) + }; + let why = named(&Revision::default().id().to_string()).unwrap_err(); + assert!(why.contains("naming the base revision"), "{why}"); + let unknown = Id::of(br#"["elsewhere"]"#); + let why = named(&unknown.to_string()).unwrap_err(); + assert!( + why.starts_with(&format!( + "revision {unknown}, which this continuum doesn't know" + )), + "{why}" + ); + assert!(named("no ID").unwrap_err().contains("no revision's ID")); + for revision in Revision::known().skip(1) { + let version = named(&revision.id().to_string()).expect("a version"); + assert_eq!(version.revision, revision); + } + } + #[test] fn a_version_changes_another_by_its_number_hash_and_sinces() { let first = Version::read(&first()).expect("a version"); |
