Updated according to comments

onflow · Aug 9, 2024 · 832a677 · 832a677
1 parent 6ed311f
commit 832a677
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 22 deletions.
diff --git a/openapi/access.yaml b/openapi/access.yaml
@@ -1193,6 +1193,17 @@ components:
       properties:
         chain_id:
           type: string
+    CompatibleRange:
+      type: object
+      description: A compatible version range.
+      required:
+        - start_height
+        - end_height
+      properties:
+        start_height:
+          type: string
+        end_height:
+          type: string
     NodeVersionInfo:
       type: object
       required:
@@ -1202,8 +1213,7 @@ components:
         - protocol_version
         - spork_root_block_height
         - node_root_block_height
-        - protocol_version_start_height
-        - protocol_version_end_height
+        - execution_version_range
       properties:
         semver:
           type: string
@@ -1220,12 +1230,8 @@ components:
         node_root_block_height:
           type: string
           format: uint64
-        protocol_version_start_height:
-          type: string
-          format: uint64
-        protocol_version_end_height:
-          type: string
-          format: uint64
+        execution_version_range:
+          $ref: '#/components/schemas/CompatibleRange'
     SubscribeEvents:
       type: object
       properties:

diff --git a/openapi/go-client-generated/README.md b/openapi/go-client-generated/README.md
@@ -55,6 +55,7 @@ Class | Method | HTTP request | Description
  - [Collection](docs/Collection.md)
  - [CollectionExpandable](docs/CollectionExpandable.md)
  - [CollectionGuarantee](docs/CollectionGuarantee.md)
+ - [CompatibleRange](docs/CompatibleRange.md)
  - [Event](docs/Event.md)
  - [ExecutionResult](docs/ExecutionResult.md)
  - [HashingAlgorithm](docs/HashingAlgorithm.md)

diff --git a/openapi/go-client-generated/api/swagger.yaml b/openapi/go-client-generated/api/swagger.yaml
@@ -2070,13 +2070,26 @@ components:
           type: string
       example:
         chain_id: chain_id
+    CompatibleRange:
+      required:
+      - end_height
+      - start_height
+      type: object
+      properties:
+        start_height:
+          type: string
+        end_height:
+          type: string
+      description: A compatible version range.
+      example:
+        end_height: end_height
+        start_height: start_height
     NodeVersionInfo:
       required:
       - commit
+      - execution_version_range
       - node_root_block_height
       - protocol_version
-      - protocol_version_end_height
-      - protocol_version_start_height
       - semver
       - spork_id
       - spork_root_block_height
@@ -2097,19 +2110,16 @@ components:
         node_root_block_height:
           type: string
           format: uint64
-        protocol_version_start_height:
-          type: string
-          format: uint64
-        protocol_version_end_height:
-          type: string
-          format: uint64
+        execution_version_range:
+          $ref: '#/components/schemas/CompatibleRange'
       example:
         protocol_version: protocol_version
+        execution_version_range:
+          end_height: end_height
+          start_height: start_height
         semver: semver
         commit: commit
-        protocol_version_start_height: protocol_version_start_height
         node_root_block_height: node_root_block_height
-        protocol_version_end_height: protocol_version_end_height
         spork_id: spork_id
         spork_root_block_height: spork_root_block_height
     SubscribeEvents:

diff --git a/openapi/go-client-generated/docs/CompatibleRange.md b/openapi/go-client-generated/docs/CompatibleRange.md
@@ -0,0 +1,10 @@
+# CompatibleRange
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StartHeight** | **string** |  | [default to null]
+**EndHeight** | **string** |  | [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/openapi/go-client-generated/docs/NodeVersionInfo.md b/openapi/go-client-generated/docs/NodeVersionInfo.md
@@ -9,8 +9,7 @@ Name | Type | Description | Notes
 **ProtocolVersion** | **string** |  | [default to null]
 **SporkRootBlockHeight** | **string** |  | [default to null]
 **NodeRootBlockHeight** | **string** |  | [default to null]
-**ProtocolVersionStartHeight** | **string** |  | [default to null]
-**ProtocolVersionEndHeight** | **string** |  | [default to null]
+**ExecutionVersionRange** | [***CompatibleRange**](CompatibleRange.md) |  | [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/openapi/go-client-generated/model_compatible_range.go b/openapi/go-client-generated/model_compatible_range.go
@@ -0,0 +1,15 @@
+/*
+ * Access API
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * API version: 1.0.0
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+package swagger
+
+// A compatible version range.
+type CompatibleRange struct {
+	StartHeight string `json:"start_height"`
+	EndHeight string `json:"end_height"`
+}
diff --git a/openapi/go-client-generated/model_node_version_info.go b/openapi/go-client-generated/model_node_version_info.go
@@ -15,6 +15,5 @@ type NodeVersionInfo struct {
 	ProtocolVersion string `json:"protocol_version"`
 	SporkRootBlockHeight string `json:"spork_root_block_height"`
 	NodeRootBlockHeight string `json:"node_root_block_height"`
-	ProtocolVersionStartHeight string `json:"protocol_version_start_height"`
-	ProtocolVersionEndHeight string `json:"protocol_version_end_height"`
+	ExecutionVersionRange *CompatibleRange `json:"execution_version_range"`
 }