Clean up unecessary allOfs (#1797)

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

data/event-schemas/schema/m.call.reject.yaml

@@ -18,9 +18,7 @@ allOf:
 - "$ref": core-event-schema/room_event.yaml
 properties:
   content:
-    type: object
-    allOf:
-    - "$ref": core-event-schema/call_event.yaml
+    "$ref": core-event-schema/call_event.yaml
   type:
     type: string
     enum:

data/event-schemas/schema/m.key.verification.accept.yaml

@@ -44,8 +44,7 @@ properties:
           ephemeral public key (encoded as unpadded base64) and the canonical JSON
           representation of the `m.key.verification.start` message.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - method
       - key_agreement_protocol

data/event-schemas/schema/m.key.verification.cancel.yaml

@@ -58,8 +58,7 @@ properties:
           respond again with `m.unexpected_message` to avoid the other device potentially
           sending another error response.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - code
       - reason

data/event-schemas/schema/m.key.verification.done.yaml

@@ -13,8 +13,7 @@ properties:
           Required when sent as a to-device message. The opaque identifier for
           the verification process/request.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     type: object
   type:
     enum:

data/event-schemas/schema/m.key.verification.key.yaml

@@ -18,8 +18,7 @@ properties:
         description: |-
           The device's ephemeral public key, encoded as unpadded base64.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - key
     type: object

data/event-schemas/schema/m.key.verification.mac.yaml

@@ -29,8 +29,7 @@ properties:
           The MAC of the comma-separated, sorted, list of key IDs given in the `mac`
           property, encoded as unpadded base64.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - mac
       - keys

data/event-schemas/schema/m.key.verification.ready.yaml

@@ -27,8 +27,7 @@ properties:
         items:
           type: string
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - from_device
       - methods

data/event-schemas/schema/m.key.verification.start$m.reciprocate.v1.yaml

@@ -30,8 +30,7 @@ properties:
         description: |-
           The shared secret from the QR code, encoded using unpadded base64.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - from_device
       - method

data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml

@@ -58,8 +58,7 @@ properties:
           type: string
           enum: ["decimal", "emoji"]
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - from_device
       - method

data/event-schemas/schema/m.key.verification.start.yaml

@@ -32,8 +32,7 @@ properties:
           when the `method` chosen only verifies one user's key. This field will
           never be present if the `method` verifies keys both ways.
       m.relates_to:
-        allOf:
-          - $ref: m.key.verification.m.relates_to.yaml
+        $ref: m.key.verification.m.relates_to.yaml
     required:
       - from_device
       - method