aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/access/holding.rs26
-rw-r--r--src/document/events.rs10
2 files changed, 18 insertions, 18 deletions
diff --git a/src/access/holding.rs b/src/access/holding.rs
index 8e58b66..631b36a 100644
--- a/src/access/holding.rs
+++ b/src/access/holding.rs
@@ -166,14 +166,24 @@ mod tests {
judged(&mut beside, "node-b", |doc| put(doc, &key, &event)),
Ok(())
);
- // Again, at a key held already: refused.
- assert!(
- judged(&mut doc, "node-a", |doc| {
- events::put_held(doc, &id, &event);
- Ok(())
- })
- .is_err()
- );
+ // Again, at a key held already: refused. Automerge writes no put of the value a
+ // key holds, so the change is one made by hand.
+ let heads = doc.get_heads();
+ let at = At::new(&doc, &heads).unwrap();
+ let path = meta::path(&[meta::EVENTS, &key]);
+ let again = Change {
+ hash: crate::document::ChangeHash([0; 32]),
+ deps: &heads,
+ seen: &heads,
+ committer: Some("node-b"),
+ user: None,
+ paths: &std::collections::BTreeSet::from([path.clone()]),
+ ops: &[Op {
+ path,
+ action: Action::PutBytes(event.clone()),
+ }],
+ };
+ assert!(judge(&at, &again, "federation").is_err());
// At another key, or too large: refused.
let mut doc = swarm();
assert!(
diff --git a/src/document/events.rs b/src/document/events.rs
index 687079e..5fce55d 100644
--- a/src/document/events.rs
+++ b/src/document/events.rs
@@ -132,16 +132,6 @@ pub(crate) fn is_genesis(change: &Change, fold: &str, id: &Id) -> bool {
root.is_some_and(|root| genesis(fold, &root).hash() == change.hash())
}
-/// Puts `bytes` at the event `id`, held there or not, as no change of a node puts an
-/// event: for tests of what a change may write.
-#[cfg(test)]
-pub(crate) fn put_held(doc: &mut super::Transaction<'_>, id: &Id, bytes: &[u8]) {
- use automerge::transaction::Transactable;
- let events = events_map(doc).expect("the events' map");
- doc.put(&events, id.to_string(), ScalarValue::Bytes(bytes.to_vec()))
- .expect("a put");
-}
-
#[cfg(test)]
mod tests {
use super::*;