From 694347ad456766004e2792c4b4cda865a8a40386 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 31 Oct 2026 13:25:11 +0100
Subject: rename AutoMerge to Document

---
 src/swarm/blob.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/swarm/blob.rs')

diff --git a/src/swarm/blob.rs b/src/swarm/blob.rs
index ec99c93..57b02b2 100644
--- a/src/swarm/blob.rs
+++ b/src/swarm/blob.rs
@@ -28,11 +28,11 @@ use std::sync::{Arc, Mutex, MutexGuard};
 use std::time::Duration;
 
 use anyhow::{Result, anyhow, bail};
-use automerge::{AutoCommit, ChangeHash};
 use tokio::sync::{Semaphore, mpsc};
 use tokio::time::Instant;
 use tracing::{debug, info, warn};
 
+use crate::document::{ChangeHash, Document};
 use crate::locks::MutexExt;
 use crate::state::AppState;
 use crate::transport::{BlobBody, BlobId, BlobMessage, DeltaSpec, ParsedMessage};
@@ -586,9 +586,9 @@ pub(crate) async fn fetch_change(
     state: &AppState,
     hash: ChangeHash,
     peers: Vec<String>,
-) -> Result<automerge::Change> {
+) -> Result<crate::document::Change> {
     let bytes = fetch(state, BlobId::Change(hash), peers, None, None).await?;
-    let change = automerge::Change::from_bytes(bytes)
+    let change = crate::document::Change::from_bytes(bytes)
         .map_err(|error| anyhow!("downloaded change {hash} doesn't load: {error}"))?;
     if change.hash() != hash {
         bail!("downloaded change has hash {}, not {hash}", change.hash());
@@ -608,9 +608,9 @@ pub(crate) async fn fetch_delta(
 
 /// The bytes of delta `spec` from `doc`: the changes in the history of `spec.to` but
 /// not of `spec.from`, each as Automerge encodes it, sorted by hash and concatenated
-/// (`AutoCommit::load_incremental` reads that). The same on every node holding `to`,
+/// (`Document::load_incremental` reads that). The same on every node holding `to`,
 /// whatever else it has. None if `doc` lacks part of `to`.
-pub(crate) fn delta_bytes(doc: &mut AutoCommit, spec: &DeltaSpec) -> Option<Vec<u8>> {
+pub(crate) fn delta_bytes(doc: &mut Document, spec: &DeltaSpec) -> Option<Vec<u8>> {
     if spec
         .to
         .iter()
@@ -659,7 +659,7 @@ mod tests {
     use super::*;
     use automerge::{ActorId, ROOT, transaction::Transactable};
 
-    fn random_write(rng: &mut crate::testrand::Rng, doc: &mut AutoCommit) {
+    fn random_write(rng: &mut crate::testrand::Rng, doc: &mut Document) {
         let key = format!("k{}", rng.below(6));
         doc.put(ROOT, key, rng.below(100) as i64).unwrap();
         doc.commit();
@@ -677,12 +677,12 @@ mod tests {
     fn delta_bytes_are_the_same_everywhere_and_complete() {
         crate::testrand::for_seeds(200, |rng| {
             let actor = |i: u8| ActorId::from(&[i; 16][..]);
-            let mut base = AutoCommit::new().with_actor(actor(0));
+            let mut base = Document::new().with_actor(actor(0));
             for _ in 0..rng.between(0, 5) {
                 random_write(rng, &mut base);
             }
             let from = base.get_heads();
-            let mut writers: Vec<AutoCommit> = (1..=rng.between(1, 3))
+            let mut writers: Vec<Document> = (1..=rng.between(1, 3))
                 .map(|i| base.fork().with_actor(actor(i as u8)))
                 .collect();
             for _ in 0..rng.between(1, 15) {
@@ -714,7 +714,7 @@ mod tests {
 
     #[test]
     fn no_delta_without_its_heads() {
-        let mut doc = AutoCommit::new();
+        let mut doc = Document::new();
         doc.put(ROOT, "k", 1_i64).unwrap();
         doc.commit();
         let spec = DeltaSpec::new(Vec::new(), vec![ChangeHash([7; 32])]);
-- 
cgit v1.3.1