Merge PDUs and Events into one object

2 files changed, 7 insertions, 6 deletions

diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py

index ad09fab392..efac4075dc 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -23,7 +23,7 @@ from ..utils import MockHttpResource, MockClock, MockKey
 
 from synapse.server import HomeServer
 from synapse.federation import initialize_http_replication
-from synapse.federation.units import Pdu
+from synapse.api.events import SynapseEvent
 
 
 def make_pdu(prev_pdus=[], **kwargs):
@@ -40,7 +40,7 @@ def make_pdu(prev_pdus=[], **kwargs):
     }
     pdu_fields.update(kwargs)
 
-    return Pdu(prev_pdus=prev_pdus, **pdu_fields)
+    return SynapseEvent(prev_pdus=prev_pdus, **pdu_fields)
 
 
 class FederationTestCase(unittest.TestCase):
@@ -169,7 +169,7 @@ class FederationTestCase(unittest.TestCase):
             (200, "OK")
         )
 
-        pdu = Pdu(
+        pdu = SynapseEvent(
             event_id="abc123def456",
             origin="red",
             room_id="my-context",
@@ -189,7 +189,7 @@ class FederationTestCase(unittest.TestCase):
                 "origin_server_ts": 1000000,
                 "origin": "test",
                 "pdus": [
-                    pdu.get_dict(),
+                    pdu.get_pdu_json(),
                 ],
                 'pdu_failures': [],
             },
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py

index 3f17ca8fb0..e19b073817 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -19,9 +19,10 @@ from tests import unittest
 from synapse.api.events.room import (
     MessageEvent,
 )
+
+from synapse.api.events import SynapseEvent
 from synapse.handlers.federation import FederationHandler
 from synapse.server import HomeServer
-from synapse.federation.units import Pdu
 
 from mock import NonCallableMock, ANY, Mock
 
@@ -74,7 +75,7 @@ class FederationTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_msg(self):
-        pdu = Pdu(
+        pdu = SynapseEvent(
             type=MessageEvent.TYPE,
             room_id="foo",
             content={"msgtype": u"fooo"},