1 files changed, 22 insertions, 25 deletions

diff --git a/src/state/mod.rs b/src/state/mod.rs
index e079340..26910b6 100644
--- a/src/state/mod.rs
+++ b/src/state/mod.rs
@@ -692,8 +692,8 @@ impl AppState {
     }
 
     /// Signs the change just made in `replica`, if any (the one head after `before`, as
-    /// it builds on every head before), as `sign` says, or as `--sign-every` or the
-    /// policy has it; or keeps it as left unsigned.
+    /// it builds on every head before), as `sign` says, or as `--sign-every` has it; or
+    /// keeps it as left unsigned, for the sync message that takes it (`sign_sent`).
     fn sign_made(
         &self,
         replica: &mut crate::document::replica::Replica,
@@ -707,10 +707,7 @@ impl AppState {
         if after != before
             && let [hash] = after[..]
         {
-            if self.sign_every == SignEvery::Change
-                || sign.wanted(&replica.doc)
-                || crate::access::policy::of(&replica.doc).required()
-            {
+            if self.sign_every == SignEvery::Change || sign.wanted(&replica.doc) {
                 replica.signatures.sign(&replica.doc, hash, key);
             } else {
                 replica.signatures.left_unsigned(hash);
@@ -718,27 +715,27 @@ impl AppState {
         }
     }
 
-    /// This node's latest change signed, if no signature vouches for it yet, every
-    /// `every` (`--sign-every`): every change it makes is vouched for within that.
-    pub(crate) async fn sign_latest_every(self, every: Duration) {
-        let Some(key) = self.node_key.clone() else {
+    /// Before a sync message is made from `doc`: this node's latest change signed, if
+    /// no signature vouches for it yet and it signs what it sends (`--sign-every sent`,
+    /// or `none` under a policy requiring signatures), so it leaves with its signature.
+    /// Looked at first under the read lock: mostly there is nothing to sign. Blocking.
+    pub(crate) fn sign_sent(&self, doc: &crate::document::lock::DocumentLock) {
+        let Some(key) = &self.node_key else {
             return;
         };
-        let mut ticks = tokio::time::interval(every);
-        ticks.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
-        loop {
-            ticks.tick().await;
-            let state = self.clone();
-            let key = Arc::clone(&key);
-            let _ = tokio::task::spawn_blocking(move || {
-                // Looked at first under the read lock: mostly there is nothing to sign.
-                state.doc.blocking_read().signatures.pending() && {
-                    let mut replica = state.doc.blocking_write();
-                    let replica = &mut *replica;
-                    replica.signatures.sign_latest(&replica.doc, &key)
-                }
-            })
-            .await;
+        if self.sign_every == SignEvery::Change {
+            return;
+        }
+        let due = {
+            let replica = doc.blocking_read();
+            replica.signatures.pending()
+                && (self.sign_every == SignEvery::Sent
+                    || crate::access::policy::of(&replica.doc).required())
+        };
+        if due {
+            let mut replica = doc.blocking_write();
+            let replica = &mut *replica;
+            replica.signatures.sign_latest(&replica.doc, key);
         }
     }