Remove debug changes

scripts-dev/complement.sh

@@ -65,4 +65,4 @@ if [[ -n "$1" ]]; then
 fi
 
 # Run the tests!
-go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716,msc2403 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests -run TestBackfillingHistory/parallel/Historical_messages_are_visible_when_joining_on_federated_server_-_pre-made_insertion_event
+go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716,msc2403 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests

synapse/events/utils.py

@@ -253,13 +253,13 @@ def format_event_for_client_v1(d):
 
 def format_event_for_client_v2(d):
     drop_keys = (
-        # "auth_events",
-        # "prev_events",
-        # "hashes",
-        # "signatures",
-        # "depth",
-        # "origin",
-        # "prev_state",
+        "auth_events",
+        "prev_events",
+        "hashes",
+        "signatures",
+        "depth",
+        "origin",
+        "prev_state",
     )
     for key in drop_keys:
         d.pop(key, None)

synapse/storage/databases/main/event_federation.py

@@ -1005,7 +1005,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
                 connected_insertion_event_query, (event_id, limit - len(event_results))
             )
             connected_insertion_event_id_results = txn.fetchall()
-            logger.info(
+            logger.debug(
                 "_get_backfill_events: connected_insertion_event_query %s",
                 connected_insertion_event_id_results,
             )
@@ -1020,7 +1020,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
                     (connected_insertion_event, limit - len(event_results)),
                 )
                 chunk_start_event_id_results = txn.fetchall()
-                logger.info(
+                logger.debug(
                     "_get_backfill_events: chunk_start_event_id_results %s",
                     chunk_start_event_id_results,
                 )
@@ -1030,7 +1030,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
 
             txn.execute(query, (event_id, False, limit - len(event_results)))
             prev_event_id_results = txn.fetchall()
-            logger.info(
+            logger.debug(
                 "_get_backfill_events: prev_event_ids %s", prev_event_id_results
             )
 

synapse/storage/databases/main/events.py

@@ -1777,7 +1777,7 @@ class PersistEventsStore:
             # Invalid insertion event without next chunk ID
             return
 
-        logger.info(
+        logger.debug(
             "_handle_insertion_event (next_chunk_id=%s) %s", next_chunk_id, event
         )
 
@@ -1818,7 +1818,7 @@ class PersistEventsStore:
             # No chunk connection to persist
             return
 
-        logger.info("_handle_chunk_id %s %s", chunk_id, event)
+        logger.debug("_handle_chunk_id %s %s", chunk_id, event)
 
         # Keep track of the insertion event and the chunk ID
         self.db_pool.simple_insert_txn(