Remove use of allOf

ethereum · Oct 28, 2022 · 752d067 · 752d067
1 parent a795114
commit 752d067
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 29 deletions.
diff --git a/apis/beacon/pool/bls_to_execution_changes.yaml b/apis/beacon/pool/bls_to_execution_changes.yaml
@@ -40,10 +40,9 @@ post:
       content:
         application/json:
           schema:
-            allOf:
-              - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ErrorMessage"
-              - example:
-                  code: 400
-                  message: "Invalid BLS to execution change, it will never pass validation so it's rejected"
+            $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ErrorMessage"
+            example:
+              code: 400
+              message: "Invalid BLS to execution change, it will never pass validation so it's rejected"
     "500":
       $ref: '../../../beacon-node-oapi.yaml#/components/responses/InternalError'
diff --git a/types/capella/state.yaml b/types/capella/state.yaml
@@ -16,59 +16,51 @@ Capella:
       block_roots:
         type: array
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Root'
+          $ref: '../primitive.yaml#/Root'
         minItems: 8192
         maxItems: 8192
       state_roots:
         type: array
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Root'
+          $ref: '../primitive.yaml#/Root'
         minItems: 8192
         maxItems: 8192
       historical_roots:
         type: array
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Root'
+          $ref: '../primitive.yaml#/Root'
         maxItems: 16777216
       eth1_data:
         $ref: "../eth1.yaml#/Eth1Data"
       eth1_data_votes:
         type: array
         items:
-          allOf:
-            - $ref: '../eth1.yaml#/Eth1Data'
+          $ref: '../eth1.yaml#/Eth1Data'
         maxItems: 1024
       eth1_deposit_index:
         $ref: "../primitive.yaml#/Uint64"
       validators:
         type: array
         maxItems: 1099511627776
         items:
-          allOf:
-            - $ref: '../validator.yaml#/Validator'
+          $ref: '../validator.yaml#/Validator'
       balances:
         type: array
         description: "Validator balances in gwei"
         maxItems: 1099511627776
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Uint64'
+          $ref: '../primitive.yaml#/Uint64'
       randao_mixes:
         type: array
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Bytes32'
+          $ref: '../primitive.yaml#/Bytes32'
         minItems: 65536
         maxItems: 65536
       slashings:
         type: array
         description: "Per-epoch sums of slashed effective balances"
         items:
-          allOf:
-            - $ref: '../primitive.yaml#/Uint64'
+          $ref: '../primitive.yaml#/Uint64'
         minItems: 8192
         maxItems: 8192
       previous_epoch_participation:
@@ -89,8 +81,7 @@ Capella:
         type: array
         maxItems: 1099511627776
         items:
-          allOf:
-            - $ref: "../primitive.yaml#/Uint64"
+          $ref: "../primitive.yaml#/Uint64"
       current_sync_committee:
         $ref: "../altair/sync_committee.yaml#/Altair/SyncCommittee"
       next_sync_committee:
@@ -101,8 +92,7 @@ Capella:
         type: array
         maxItems: 1099511627776
         items:
-          allOf:
-            - $ref: '../withdrawal.yaml#/Withdrawal'
+          $ref: '../withdrawal.yaml#/Withdrawal'
       next_withdrawal_index:
         $ref: "../primitive.yaml#/Uint64"
       next_partial_withdrawal_validator_index:

diff --git a/types/capella/transactions.yaml b/types/capella/transactions.yaml
@@ -2,6 +2,5 @@ Capella:
   Transactions:
       type: array
       items:
-        allOf:
-          - $ref: '../primitive.yaml#/Transaction'
+        $ref: '../primitive.yaml#/Transaction'
       maxItems: 1048576
diff --git a/types/capella/withdrawals.yaml b/types/capella/withdrawals.yaml
@@ -2,6 +2,5 @@ Capella:
   Withdrawals:
       type: array
       items:
-        allOf:
-          - $ref: '../withdrawal.yaml#/Withdrawal'
+        $ref: '../withdrawal.yaml#/Withdrawal'
       maxItems: 16