Fix rebase conflicts

Author: expede

keyhive_core/benches/bench_utils.rs

@@ -83,7 +83,7 @@ pub async fn setup_scenario(n_peers: usize, prekey_rotations_per_peer: usize) ->
             .add_member(
                 Agent::Individual(*peer_id, peer_on_alice.dupe()),
                 &Membered::Document(doc1_id, doc1.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await
@@ -117,7 +117,7 @@ pub async fn setup_scenario(n_peers: usize, prekey_rotations_per_peer: usize) ->
             .add_member(
                 Agent::Individual(*peer_id, peer_on_alice.dupe()),
                 &Membered::Group(group_id, group.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await

keyhive_core/src/keyhive.rs

@@ -3465,7 +3465,7 @@ mod tests {
             .add_member(
                 Agent::Individual(carol_id, carol_indie.dupe()),
                 &Membered::Document(doc1_id, doc1.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await
@@ -3503,7 +3503,7 @@ mod tests {
             .add_member(
                 Agent::Individual(eve_id, eve_indie.dupe()),
                 &Membered::Group(group_id, group.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await
@@ -3670,7 +3670,7 @@ mod tests {
             .add_member(
                 Agent::Individual(carol_id, carol_indie.dupe()),
                 &Membered::Document(doc1_id, doc1.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await
@@ -3692,7 +3692,7 @@ mod tests {
             .add_member(
                 Agent::Individual(carol_id, carol_indie.dupe()),
                 &Membered::Group(group_id, group.dupe()),
-                Access::Write,
+                Access::Edit,
                 &[],
             )
             .await