author -> participant_name

src/magic_folder/config.py

@@ -822,9 +822,8 @@ class Conflict(object):
     Represents information about a particular conflict.
     """
     snapshot_cap = attr.ib()  # Tahoe URI
-    author_name = attr.ib(validator=instance_of(str))
-##    participant_name = attr.ib(validator=instance_of(str))
-# should probably re-name to "participant_name" since that's what it is ...?
+    participant_name = attr.ib(validator=instance_of(str))
+
 
 @attr.s
 class MagicFolderConfig(object):
@@ -1615,7 +1614,6 @@ def add_conflict(self, cursor, snapshot, participant):
                 VALUES
                     (?,?,?)
                 """,
-                ##(snapshot.relpath, snapshot.author.name, snapshot.capability.danger_real_capability_string()),
                 (snapshot.relpath, participant.name, snapshot.capability.danger_real_capability_string()),
             )
 

src/magic_folder/magic_file.py

@@ -309,17 +309,17 @@ def resolve_conflict(self, resolution):
         if resolution is None:
             keep_path = self._relpath
             rejected = [
-                conflict_to_marker(self._relpath, con.author_name)
+                conflict_to_marker(self._relpath, con.participant_name)
                 for con in conflicts
             ]
         else:
             if resolution not in conflicts:
                 raise ResolutionError(
                     "Resolution not found as existing conflict"
                 )
-            keep_path = conflict_to_marker(self._relpath, resolution.author_name)
+            keep_path = conflict_to_marker(self._relpath, resolution.participant_name)
             rejected = [
-                conflict_to_marker(self._relpath, con.author_name)
+                conflict_to_marker(self._relpath, con.participant_name)
                 for con in conflicts
                 if con != resolution
             ]
@@ -1105,7 +1105,7 @@ def _check_if_conflict_resolved(self, snapshot):
             if rs.danger_real_capability_string() in snapshot.parents_raw:
                 conflicts = self._factory._config.list_conflicts_for(self._relpath)
                 rejected = [
-                    conflict_to_marker(self._relpath, conflict.author_name)
+                    conflict_to_marker(self._relpath, conflict.participant_name)
                     for conflict in conflicts
                 ]
                 self._factory._magic_fs.mark_not_conflicted(self._relpath, self._relpath, rejected)

src/magic_folder/web.py

@@ -537,7 +537,7 @@ def list_conflicts(request, folder_name):
         folder_config = global_config.get_magic_folder(folder_name)
         return json.dumps({
             relpath: [
-                conflict.author_name
+                conflict.participant_name
                 for conflict in conflicts
             ]
             for relpath, conflicts in folder_config.list_conflicts().items()
@@ -584,7 +584,7 @@ def resolve_conflict(request, folder_name):
             matching_conflicts = [
                 conflict
                 for conflict in conflicts
-                if conflict.author_name == participant_name
+                if conflict.participant_name == participant_name
             ]
             if not matching_conflicts:
                 raise _InputError('"{relpath}" is not conflicted with "{take}"'.format(**resolution))
@@ -610,7 +610,7 @@ def resolve_conflict(request, folder_name):
 
         return json.dumps({
             relpath: [
-                conflict.author_name
+                conflict.participant_name
                 for conflict in conflicts
             ]
         }).encode("utf8")