Rename annotate_state_groups to annotate_event_with_state

2 files changed, 8 insertions, 8 deletions

diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 07a8464107..30c6733063 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -64,7 +64,7 @@ class BaseHandler(object):
 
         snapshot.fill_out_prev_events(event)
 
-        yield self.state_handler.annotate_state_groups(event)
+        yield self.state_handler.annotate_event_with_state(event)
 
         yield self.auth.add_auth_events(event)
 
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index c2cd91bb39..d8d5730b65 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -111,7 +111,7 @@ class FederationHandler(BaseHandler):
         if state:
             state = [self.pdu_codec.event_from_pdu(p) for p in state]
 
-        is_new_state = yield self.state_handler.annotate_state_groups(
+        is_new_state = yield self.state_handler.annotate_event_with_state(
             event,
             old_state=state
         )
@@ -202,7 +202,7 @@ class FederationHandler(BaseHandler):
             event = self.pdu_codec.event_from_pdu(pdu)
 
             # FIXME (erikj): Not sure this actually works :/
-            yield self.state_handler.annotate_state_groups(event)
+            yield self.state_handler.annotate_event_with_state(event)
 
             events.append(event)
 
@@ -268,7 +268,7 @@ class FederationHandler(BaseHandler):
 
             logger.debug("do_invite_join state: %s", state)
 
-            is_new_state = yield self.state_handler.annotate_state_groups(
+            is_new_state = yield self.state_handler.annotate_event_with_state(
                 event,
                 old_state=state
             )
@@ -289,7 +289,7 @@ class FederationHandler(BaseHandler):
                 # FIXME: Auth these.
                 e.outlier = True
 
-                yield self.state_handler.annotate_state_groups(
+                yield self.state_handler.annotate_event_with_state(
                     e,
                 )
 
@@ -330,7 +330,7 @@ class FederationHandler(BaseHandler):
         snapshot = yield self.store.snapshot_room(event)
         snapshot.fill_out_prev_events(event)
 
-        yield self.state_handler.annotate_state_groups(event)
+        yield self.state_handler.annotate_event_with_state(event)
         yield self.auth.add_auth_events(event)
         self.auth.check(event, raises=True)
 
@@ -345,7 +345,7 @@ class FederationHandler(BaseHandler):
 
         event.outlier = False
 
-        is_new_state = yield self.state_handler.annotate_state_groups(event)
+        is_new_state = yield self.state_handler.annotate_event_with_state(event)
         self.auth.check(event, raises=True)
 
         # FIXME (erikj):  All this is duplicated above :(
@@ -421,7 +421,7 @@ class FederationHandler(BaseHandler):
             )
         )
 
-        yield self.state_handler.annotate_state_groups(event)
+        yield self.state_handler.annotate_event_with_state(event)
 
         yield self.store.persist_event(
             event,