Pass room version object into `FederationClient.get_pdu`
parent
577f460369
commit
f84700fba8
|
@ -230,7 +230,7 @@ class FederationClient(FederationBase):
|
||||||
self,
|
self,
|
||||||
destinations: Iterable[str],
|
destinations: Iterable[str],
|
||||||
event_id: str,
|
event_id: str,
|
||||||
room_version: str,
|
room_version: RoomVersion,
|
||||||
outlier: bool = False,
|
outlier: bool = False,
|
||||||
timeout: Optional[int] = None,
|
timeout: Optional[int] = None,
|
||||||
) -> Optional[EventBase]:
|
) -> Optional[EventBase]:
|
||||||
|
@ -262,7 +262,7 @@ class FederationClient(FederationBase):
|
||||||
|
|
||||||
pdu_attempts = self.pdu_destination_tried.setdefault(event_id, {})
|
pdu_attempts = self.pdu_destination_tried.setdefault(event_id, {})
|
||||||
|
|
||||||
format_ver = room_version_to_event_format(room_version)
|
format_ver = room_version.event_format
|
||||||
|
|
||||||
signed_pdu = None
|
signed_pdu = None
|
||||||
for destination in destinations:
|
for destination in destinations:
|
||||||
|
@ -292,7 +292,9 @@ class FederationClient(FederationBase):
|
||||||
pdu = pdu_list[0]
|
pdu = pdu_list[0]
|
||||||
|
|
||||||
# Check signatures are correct.
|
# Check signatures are correct.
|
||||||
signed_pdu = await self._check_sigs_and_hash(room_version, pdu)
|
signed_pdu = await self._check_sigs_and_hash(
|
||||||
|
room_version.identifier, pdu
|
||||||
|
)
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
|
@ -1110,7 +1110,7 @@ class FederationHandler(BaseHandler):
|
||||||
Logs a warning if we can't find the given event.
|
Logs a warning if we can't find the given event.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
room_version = await self.store.get_room_version_id(room_id)
|
room_version = await self.store.get_room_version(room_id)
|
||||||
|
|
||||||
event_infos = []
|
event_infos = []
|
||||||
|
|
||||||
|
@ -1916,11 +1916,7 @@ class FederationHandler(BaseHandler):
|
||||||
|
|
||||||
for e_id in missing_auth_events:
|
for e_id in missing_auth_events:
|
||||||
m_ev = await self.federation_client.get_pdu(
|
m_ev = await self.federation_client.get_pdu(
|
||||||
[origin],
|
[origin], e_id, room_version=room_version, outlier=True, timeout=10000,
|
||||||
e_id,
|
|
||||||
room_version=room_version.identifier,
|
|
||||||
outlier=True,
|
|
||||||
timeout=10000,
|
|
||||||
)
|
)
|
||||||
if m_ev and m_ev.event_id == e_id:
|
if m_ev and m_ev.event_id == e_id:
|
||||||
event_map[e_id] = m_ev
|
event_map[e_id] = m_ev
|
||||||
|
|
Loading…
Reference in New Issue