aboutsummaryrefslogtreecommitdiffstats
path: root/src/remake/proposal.rs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2026-10-31 18:39:31 +0100
committertv <tv@krebsco.de>2026-10-31 18:39:31 +0100
commit2cba03fa6af4aeca176d69514603bce26b9c934a (patch)
tree6324a328265d1f60e3ee4f170e61dc9a5d86a0e4 /src/remake/proposal.rs
parenta65c491cfc1b0fea8860ad64ab29a6ee8ad0faef (diff)
remake coordination use document, not automerge
Diffstat (limited to 'src/remake/proposal.rs')
-rw-r--r--src/remake/proposal.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/remake/proposal.rs b/src/remake/proposal.rs
index ede25d2..d9cd893 100644
--- a/src/remake/proposal.rs
+++ b/src/remake/proposal.rs
@@ -5,13 +5,13 @@
use std::collections::HashSet;
-use automerge::ChangeHash;
use tracing::info;
use super::coordinator;
use super::records::{self, Decision, Phase, Proposal, Record, Vote};
use super::{Host, kind, vote};
use crate::clock::UnixMillis;
+use crate::document::ChangeHash;
use crate::document::store::StoreError;
use crate::force::Force;
@@ -220,9 +220,7 @@ pub(super) async fn propose<H: Host>(
if !base_at_commit {
let base = match base {
Some(base) => {
- if let Some(unknown) = base
- .iter()
- .find(|head| doc.get_change_by_hash(head).is_none())
+ if let Some(unknown) = crate::document::changes::missing(doc, &base).first()
{
return Err(StartError::UnknownBase(unknown.to_string()));
}