diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index e0e4de4e8c..4cf72b2e42 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -25,7 +25,6 @@ from .units import Pdu
from synapse.util.logutils import log_function
-import copy
import json
import logging
@@ -41,28 +40,6 @@ class PduActions(object):
self.store = datastore
@log_function
- def persist_received(self, pdu):
- """ Persists the given `Pdu` that was received from a remote home
- server.
-
- Returns:
- Deferred
- """
- return self._persist(pdu)
-
- @defer.inlineCallbacks
- @log_function
- def persist_outgoing(self, pdu):
- """ Persists the given `Pdu` that this home server created.
-
- Returns:
- Deferred
- """
- ret = yield self._persist(pdu)
-
- defer.returnValue(ret)
-
- @log_function
def mark_as_processed(self, pdu):
""" Persist the fact that we have fully processed the given `Pdu`
@@ -73,25 +50,6 @@ class PduActions(object):
@defer.inlineCallbacks
@log_function
- def populate_previous_pdus(self, pdu):
- """ Given an outgoing `Pdu` fill out its `prev_ids` key with the `Pdu`s
- that we have received.
-
- Returns:
- Deferred
- """
- results = yield self.store.get_latest_pdus_in_context(pdu.context)
-
- pdu.prev_pdus = [(p_id, origin) for p_id, origin, _ in results]
-
- vs = [int(v) for _, _, v in results]
- if vs:
- pdu.depth = max(vs) + 1
- else:
- pdu.depth = 0
-
- @defer.inlineCallbacks
- @log_function
def after_transaction(self, transaction_id, destination, origin):
""" Returns all `Pdu`s that we sent to the given remote home server
after a given transaction id.
@@ -143,28 +101,6 @@ class PduActions(object):
depth=pdu.depth
)
- @defer.inlineCallbacks
- @log_function
- def _persist(self, pdu):
- kwargs = copy.copy(pdu.__dict__)
- unrec_keys = copy.copy(pdu.unrecognized_keys)
- del kwargs["content"]
- kwargs["content_json"] = json.dumps(pdu.content)
- kwargs["unrecognized_keys"] = json.dumps(unrec_keys)
-
- logger.debug("Persisting: %s", repr(kwargs))
-
- if pdu.is_state:
- ret = yield self.store.persist_state(**kwargs)
- else:
- ret = yield self.store.persist_pdu(**kwargs)
-
- yield self.store.update_min_depth_for_context(
- pdu.context, pdu.depth
- )
-
- defer.returnValue(ret)
-
class TransactionActions(object):
""" Defines persistence actions that relate to handling Transactions.
|
