Update MatrixFederationRequest to calculate txn_id/uri.

Author: clokep

synapse/http/matrixfederationclient.py

@@ -153,21 +153,23 @@ class MatrixFederationRequest:
     """Query arguments.
     """
 
-    txn_id: Optional[str] = None
-    """Unique ID for this request (for logging)
+    txn_id: str = attr.ib(init=False)
+    """Unique ID for this request (for logging), autogenerated.
     """
 
-    uri: bytes = attr.ib(init=False)
-    """The URI of this request
-    """
-
-    def __attrs_post_init__(self) -> None:
+    @txn_id.default
+    def _create_txn_id(self) -> str:
         global _next_id
         txn_id = "%s-O-%s" % (self.method, _next_id)
         _next_id = (_next_id + 1) % (MAXINT - 1)
+        return txn_id
 
-        object.__setattr__(self, "txn_id", txn_id)
+    uri: bytes = attr.ib(init=False)
+    """The URI of this request, generated from the above information.
+    """
 
+    @uri.default
+    def _default_uri(self) -> bytes:
         destination_bytes = self.destination.encode("ascii")
         path_bytes = self.path.encode("ascii")
         query_bytes = encode_query_args(self.query)
@@ -183,7 +185,7 @@ def __attrs_post_init__(self) -> None:
                 b"",
             )
         )
-        object.__setattr__(self, "uri", uri)
+        return uri
 
     def get_json(self) -> Optional[JsonDict]:
         if self.json_callback: