SPEC-7: Rename 'ts' to 'origin_server_ts'

This commit is contained in:
Mark Haines 2014-10-17 17:12:25 +01:00
parent 456017e0ae
commit f5cf7ac25b
16 changed files with 42 additions and 42 deletions

View file

@ -99,7 +99,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
context="my-context",
pdu_type="m.topic",
ts=123456789000,
origin_server_ts=123456789000,
depth=1,
is_state=True,
content_json='{"topic":"The topic"}',
@ -134,7 +134,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
context="my-context",
pdu_type="m.text",
ts=123456789001,
origin_server_ts=123456789001,
depth=1,
content_json='{"text":"Here is the message"}',
)
@ -158,7 +158,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
destinations=["remote"],
context="my-context",
ts=123456789002,
origin_server_ts=123456789002,
pdu_type="m.test",
content={"testing": "content here"},
depth=1,
@ -170,14 +170,14 @@ class FederationTestCase(unittest.TestCase):
"remote",
path="/_matrix/federation/v1/send/1000000/",
data={
"ts": 1000000,
"origin_server_ts": 1000000,
"origin": "test",
"pdus": [
{
"origin": "red",
"pdu_id": "abc123def456",
"prev_pdus": [],
"ts": 123456789002,
"origin_server_ts": 123456789002,
"context": "my-context",
"pdu_type": "m.test",
"is_state": False,
@ -207,7 +207,7 @@ class FederationTestCase(unittest.TestCase):
path="/_matrix/federation/v1/send/1000000/",
data={
"origin": "test",
"ts": 1000000,
"origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
@ -234,7 +234,7 @@ class FederationTestCase(unittest.TestCase):
"/_matrix/federation/v1/send/1001000/",
"""{
"origin": "remote",
"ts": 1001000,
"origin_server_ts": 1001000,
"pdus": [],
"edus": [
{

View file

@ -68,7 +68,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.message",
origin="bar.com",
ts=12345,
origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=False,
@ -123,7 +123,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.topic",
origin="bar.com",
ts=12345,
origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=True,

View file

@ -68,7 +68,7 @@ class FederationTestCase(unittest.TestCase):
pdu_type=MessageEvent.TYPE,
context="foo",
content={"msgtype": u"fooo"},
ts=0,
origin_server_ts=0,
pdu_id="a",
origin="b",
)
@ -95,7 +95,7 @@ class FederationTestCase(unittest.TestCase):
target_host=self.hostname,
context=room_id,
content={},
ts=0,
origin_server_ts=0,
pdu_id="a",
origin="b",
)
@ -127,7 +127,7 @@ class FederationTestCase(unittest.TestCase):
state_key="@red:not%s" % self.hostname,
context=room_id,
content={},
ts=0,
origin_server_ts=0,
pdu_id="a",
origin="b",
)

View file

@ -39,7 +39,7 @@ ONLINE = PresenceState.ONLINE
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
"ts": 1000000,
"origin_server_ts": 1000000,
"pdus": [],
"edus": [
{

View file

@ -29,7 +29,7 @@ from synapse.handlers.typing import TypingNotificationHandler
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
"ts": 1000000,
"origin_server_ts": 1000000,
"pdus": [],
"edus": [
{

View file

@ -599,7 +599,7 @@ def new_fake_pdu(pdu_id, context, pdu_type, state_key, prev_state_id,
prev_state_id=prev_state_id,
origin="example.com",
context="context",
ts=1405353060021,
origin_server_ts=1405353060021,
depth=depth,
content_json="{}",
unrecognized_keys="{}",