Merge pull request #223 from matrix-org/paul/federation-room-join
Decide that joining HS is the one that specifies the join event ID
This commit is contained in:
commit
bcebcc61ef
1 changed files with 0 additions and 6 deletions
|
@ -630,8 +630,6 @@ the resident homeserver. The required fields are:
|
|||
``content`` Object The event content
|
||||
``depth`` Integer (this field must be present but is ignored; it
|
||||
may be 0)
|
||||
``event_id`` String A new event ID specified by the resident
|
||||
homeserver
|
||||
``origin`` String The name of the resident homeserver
|
||||
``origin_server_ts`` Integer A timestamp added by the resident homeserver
|
||||
``prev_events`` List An event-reference list containing the immediate
|
||||
|
@ -661,10 +659,6 @@ adding (or replacing) the following fields:
|
|||
``origin_server_ts`` Integer A timestamp added by the joining homeserver
|
||||
==================== ======= ============
|
||||
|
||||
.. TODO-spec
|
||||
- Why does the protoevent have an event_id, only for the real event to ignore
|
||||
it and specify a different one? We should definitely pick one or the other.
|
||||
|
||||
This will be a true event, so the joining server should apply the event-signing
|
||||
algorithm to it, resulting in the addition of the ``hashes`` and ``signatures``
|
||||
fields.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue