rename AutoMerge to Document

3 files changed, 8 insertions, 7 deletions

diff --git a/src/transport/mod.rs b/src/transport/mod.rs
index 048fe31..c10e0d8 100644
--- a/src/transport/mod.rs
+++ b/src/transport/mod.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use async_trait::async_trait;
-use automerge::ChangeHash;
 use automerge::sync::Message;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -11,6 +10,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 pub(crate) use crate::document::replica::Epoch;
 
+use crate::document::ChangeHash;
+
 // Used by the transports that don't authenticate their peers themselves (`tor`).
 #[cfg_attr(not(feature = "tor"), allow(dead_code))]
 pub(crate) mod challenge;
diff --git a/src/transport/mycelium/mod.rs b/src/transport/mycelium/mod.rs
index ac55ae9..21c939d 100644
--- a/src/transport/mycelium/mod.rs
+++ b/src/transport/mycelium/mod.rs
@@ -657,10 +657,10 @@ pub(crate) enum TransportError {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::document::ChangeHash;
     use crate::transport::{
         BlobBody, BlobId, BlobMessage, Epoch, HeadsSummary, MAX_LISTED_HEADS, Status,
     };
-    use automerge::ChangeHash;
 
     /// Mycelium splits messages into chunks of this size.
     const MYCELIUM_CHUNK: usize = 1300;
diff --git a/src/transport/wire.rs b/src/transport/wire.rs
index 46cea4c..26794a1 100644
--- a/src/transport/wire.rs
+++ b/src/transport/wire.rs
@@ -203,7 +203,7 @@ pub(crate) mod codec {
     /// An Automerge change hash.
     pub(crate) mod change_hash {
         use super::*;
-        use automerge::ChangeHash;
+        use crate::document::ChangeHash;
 
         pub(crate) fn serialize<S: Serializer>(
             value: &ChangeHash,
@@ -242,8 +242,8 @@ pub(crate) mod codec {
     /// empty), or as a digest (none listed).
     pub(crate) mod heads {
         use super::*;
+        use crate::document::ChangeHash;
         use crate::transport::{HeadsSummary, MAX_LISTED_HEADS};
-        use automerge::ChangeHash;
 
         pub(crate) fn serialize<S: Serializer>(
             value: &HeadsSummary,
@@ -290,7 +290,7 @@ pub(crate) mod codec {
     /// Change hashes, each a 32-byte binary.
     pub(crate) mod change_hashes {
         use super::*;
-        use automerge::ChangeHash;
+        use crate::document::ChangeHash;
 
         pub(crate) fn serialize<S: Serializer>(
             value: &[ChangeHash],
@@ -352,12 +352,12 @@ pub(crate) mod codec {
 /// envelope around it).
 #[cfg(test)]
 pub(crate) fn samples() -> Vec<ParsedMessage> {
+    use crate::document::ChangeHash;
     use crate::document::replica::Epoch;
     use crate::transport::{
         BlobBody, BlobId, BlobMessage, DeltaSpec, HeadsSummary, HelloReply, HelloRequest,
         IdentityProof, ListedPeer, Status, SyncBody, SyncEnvelope,
     };
-    use automerge::ChangeHash;
     let epoch = Epoch {
         generation: 2,
         id: [3; 32],
@@ -456,12 +456,12 @@ pub(crate) fn samples() -> Vec<ParsedMessage> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::document::ChangeHash;
     use crate::document::replica::Epoch;
     use crate::transport::{
         BlobBody, BlobId, BlobMessage, HeadsSummary, HelloReply, HelloRequest, IdentityProof,
         ListedPeer, MAX_LISTED_HEADS, Status,
     };
-    use automerge::ChangeHash;
 
     /// Every kind decodes to what was encoded: re-encoded, the same bytes.
     #[test]