put remake content into blobs

1 files changed, 30 insertions, 7 deletions

diff --git a/src/remake/records.rs b/src/remake/records.rs
index ed018ca..e3a0a7c 100644
--- a/src/remake/records.rs
+++ b/src/remake/records.rs
@@ -137,14 +137,37 @@ pub(crate) struct Proposal {
     /// The remake kind (`compact` for records written before kinds existed).
     #[serde(default = "default_kind")]
     pub(crate) kind: String,
-    /// The kind's build input.
-    #[serde(default, skip_serializing_if = "JsonValue::is_null")]
-    pub(crate) content: JsonValue,
+    /// The kind's build input, if it has one: held by the coordinator and fetched by
+    /// every voter (`content`), not stored in the record.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub(crate) content: Option<ContentRef>,
     /// The kind's translation input.
     #[serde(default, skip_serializing_if = "JsonValue::is_null")]
     pub(crate) translation: JsonValue,
 }
 
+/// Content of a remake, by reference.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct ContentRef {
+    /// BLAKE3 of the bytes, hex.
+    pub(crate) blake3: String,
+    pub(crate) size: u64,
+}
+
+impl ContentRef {
+    pub(crate) fn of(bytes: &[u8]) -> Self {
+        Self {
+            blake3: blake3::hash(bytes).to_hex().to_string(),
+            size: bytes.len() as u64,
+        }
+    }
+
+    pub(crate) fn hash(&self) -> Option<[u8; 32]> {
+        decode_hex32(&self.blake3)
+    }
+}
+
 fn default_kind() -> String {
     DEFAULT_KIND.to_owned()
 }
@@ -229,8 +252,8 @@ impl Record {
         }
     }
 
-    /// Everything needed to (re)build this remake's snapshot; None if the proposal
-    /// is unreadable.
+    /// Everything needed to (re)build this remake's snapshot but the content (which the
+    /// caller adds, `content::ensure`); None if the proposal is unreadable.
     pub(crate) fn snapshot_request(&self, id: &str) -> Option<SnapshotRequest> {
         Some(SnapshotRequest {
             remake_id: id.to_owned(),
@@ -239,7 +262,7 @@ impl Record {
             policy: serde_json::to_value(&self.proposal.policy).ok()?,
             proposed_at: self.proposal.proposed_at,
             kind: self.proposal.kind.clone(),
-            content: self.proposal.content.clone(),
+            content: None,
             translation: self.proposal.translation.clone(),
         })
     }
@@ -390,7 +413,7 @@ mod tests {
             electorate: vec!["node-a".into(), "node-b".into()],
             quorum: 2,
             kind: DEFAULT_KIND.to_owned(),
-            content: JsonValue::Null,
+            content: None,
             translation: JsonValue::Null,
         }
     }