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

@ -87,7 +87,7 @@ class TransactionStore(SQLBaseStore):
txn.execute(query, (code, response_json, transaction_id, origin))
def prep_send_transaction(self, transaction_id, destination, ts, pdu_list):
def prep_send_transaction(self, transaction_id, destination, origin_server_ts, pdu_list):
"""Persists an outgoing transaction and calculates the values for the
previous transaction id list.
@ -97,7 +97,7 @@ class TransactionStore(SQLBaseStore):
Args:
transaction_id (str)
destination (str)
ts (int)
origin_server_ts (int)
pdu_list (list)
Returns:
@ -106,10 +106,10 @@ class TransactionStore(SQLBaseStore):
return self.runInteraction(
self._prep_send_transaction,
transaction_id, destination, ts, pdu_list
transaction_id, destination, origin_server_ts, pdu_list
)
def _prep_send_transaction(self, txn, transaction_id, destination, ts,
def _prep_send_transaction(self, txn, transaction_id, destination, origin_server_ts,
pdu_list):
# First we find out what the prev_txs should be.
@ -131,7 +131,7 @@ class TransactionStore(SQLBaseStore):
None,
transaction_id=transaction_id,
destination=destination,
ts=ts,
origin_server_ts=origin_server_ts,
response_code=0,
response_json=None
))
@ -251,7 +251,7 @@ class ReceivedTransactionsTable(Table):
fields = [
"transaction_id",
"origin",
"ts",
"origin_server_ts",
"response_code",
"response_json",
"has_been_referenced",
@ -267,7 +267,7 @@ class SentTransactions(Table):
"id",
"transaction_id",
"destination",
"ts",
"origin_server_ts",
"response_code",
"response_json",
]