summary refs log tree commit diff
path: root/synapse/federation/units.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:33:58 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:33:58 +0100
commitdc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch)
tree22d02a68df93c3f98b0be7de8a07040268420369 /synapse/federation/units.py
parentRename 'meta' to 'unsigned' (diff)
parentkeep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff)
downloadsynapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz
Merge branch 'develop' into event_signing
Conflicts:
	synapse/federation/replication.py
Diffstat (limited to 'synapse/federation/units.py')
-rw-r--r--synapse/federation/units.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index c629e5793e..b81e162512 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -41,7 +41,7 @@ class Pdu(JsonEncodedObject):
 
         {
             "pdu_id": "78c",
-            "ts": 1404835423000,
+            "origin_server_ts": 1404835423000,
             "origin": "bar",
             "prev_ids": [
                 ["23b", "foo"],
@@ -56,7 +56,7 @@ class Pdu(JsonEncodedObject):
         "pdu_id",
         "context",
         "origin",
-        "ts",
+        "origin_server_ts",
         "pdu_type",
         "destinations",
         "transaction_id",
@@ -84,7 +84,7 @@ class Pdu(JsonEncodedObject):
         "pdu_id",
         "context",
         "origin",
-        "ts",
+        "origin_server_ts",
         "pdu_type",
         "content",
     ]
@@ -122,6 +122,7 @@ class Pdu(JsonEncodedObject):
         """
         if pdu_tuple:
             d = copy.copy(pdu_tuple.pdu_entry._asdict())
+            d["origin_server_ts"] = d.pop("ts")
 
             for k in d.keys():
                 if d[k] is None:
@@ -212,7 +213,7 @@ class Transaction(JsonEncodedObject):
         "transaction_id",
         "origin",
         "destination",
-        "ts",
+        "origin_server_ts",
         "previous_ids",
         "pdus",
         "edus",
@@ -229,7 +230,7 @@ class Transaction(JsonEncodedObject):
         "transaction_id",
         "origin",
         "destination",
-        "ts",
+        "origin_server_ts",
         "pdus",
     ]
 
@@ -251,10 +252,10 @@ class Transaction(JsonEncodedObject):
     @staticmethod
     def create_new(pdus, **kwargs):
         """ Used to create a new transaction. Will auto fill out
-        transaction_id and ts keys.
+        transaction_id and origin_server_ts keys.
         """
-        if "ts" not in kwargs:
-            raise KeyError("Require 'ts' to construct a Transaction")
+        if "origin_server_ts" not in kwargs:
+            raise KeyError("Require 'origin_server_ts' to construct a Transaction")
         if "transaction_id" not in kwargs:
             raise KeyError(
                 "Require 'transaction_id' to construct a Transaction"