Fix new API code gen

algorand · Dec 2, 2022 · a377e3f · a377e3f
1 parent 01349d8
commit a377e3f
Show file tree

Hide file tree

Showing 11 changed files with 752 additions and 462 deletions.
diff --git a/daemon/algod/api/Makefile b/daemon/algod/api/Makefile
@@ -2,7 +2,7 @@ GOPATH	:= $(shell go env GOPATH)
 GOPATH1	:= $(firstword $(subst :, ,$(GOPATH)))
 
 # `make all` or just `make` should be appropriate for dev work
-all:	server/v2/generated/model/types.go server/v2/generated/nonparticipating/public/routes.go server/v2/generated/nonparticipating/private/routes.go server/v2/generated/participating/public/routes.go server/v2/generated/participating/private/routes.go
+all:	server/v2/generated/model/types.go server/v2/generated/nonparticipating/public/routes.go server/v2/generated/nonparticipating/private/routes.go server/v2/generated/participating/public/routes.go server/v2/generated/participating/private/routes.go server/v2/generated/data/routes.go
 
 # `make generate` should be able to replace old `generate.sh` script and be appropriate for build system use
 generate:	oapi-codegen all
@@ -19,6 +19,10 @@ server/v2/generated/participating/public/routes.go:	algod.oas3.yml
 server/v2/generated/participating/private/routes.go:	algod.oas3.yml
 	$(GOPATH1)/bin/oapi-codegen -config ./server/v2/generated/participating/private/private_routes.yml algod.oas3.yml
 
+
+server/v2/generated/data/routes.go:	algod.oas3.yml
+	$(GOPATH1)/bin/oapi-codegen -config ./server/v2/generated/data/data_routes.yml algod.oas3.yml
+
 server/v2/generated/model/types.go:	algod.oas3.yml
 	$(GOPATH1)/bin/oapi-codegen -config ./server/v2/generated/model/model_types.yml algod.oas3.yml
 
@@ -31,6 +35,6 @@ oapi-codegen:	.PHONY
 	../../../scripts/buildtools/install_buildtools.sh -o github.com/algorand/oapi-codegen -c github.com/algorand/oapi-codegen/cmd/oapi-codegen
 
 clean:
-	rm -rf server/v2/generated/model/types.go server/v2/generated/nonparticipating/public/routes.go server/v2/generated/nonparticipating/private/routes.go server/v2/generated/participating/public/routes.go server/v2/generated/participating/private/routes.go algod.oas3.yml
+	rm -rf server/v2/generated/model/types.go server/v2/generated/nonparticipating/public/routes.go server/v2/generated/nonparticipating/private/routes.go server/v2/generated/participating/public/routes.go server/v2/generated/participating/private/routes.go server/v2/generated/data/routes.go algod.oas3.yml
 
 .PHONY:
diff --git a/daemon/algod/api/algod.oas2.json b/daemon/algod/api/algod.oas2.json
@@ -1371,6 +1371,8 @@
       "get": {
         "description": "Get ledger deltas for a round.",
         "tags": [
+            "private",
+            "data"
         ],
         "produces": [
           "application/json"
@@ -1859,7 +1861,8 @@
       "delete": {
         "description": "Unset the ledger sync round.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ],
         "schemes": [
           "http"
@@ -1902,7 +1905,8 @@
       "get": {
         "description": "Gets the minimum sync round for the ledger.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ],
         "schemes": [
           "http"
@@ -1947,7 +1951,8 @@
       "post": {
         "description": "Sets the minimum sync round on the ledger.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ],
         "schemes": [
           "http"

diff --git a/daemon/algod/api/algod.oas3.yml b/daemon/algod/api/algod.oas3.yml
@@ -3907,7 +3907,10 @@
           }
         },
         "summary": "Get a LedgerStateDelta object for a given round",
-        "tags": []
+        "tags": [
+          "private",
+          "data"
+        ]
       }
     },
     "/v2/ledger/supply": {
@@ -4021,7 +4024,8 @@
         },
         "summary": "Removes minimum sync round restriction from the ledger.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ]
       },
       "get": {
@@ -4094,7 +4098,8 @@
         },
         "summary": "Returns the minimum sync round the ledger is keeping in cache.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ]
       }
     },
@@ -4165,7 +4170,8 @@
         },
         "summary": "Given a round, tells the ledger to keep that round in its cache.",
         "tags": [
-          "private"
+          "private",
+          "data"
         ]
       }
     },

diff --git a/daemon/algod/api/server/v2/generated/data/data_routes.yml b/daemon/algod/api/server/v2/generated/data/data_routes.yml
@@ -5,10 +5,12 @@ generate:
 output-options:
   include-tags:
   - data
-  - public
-  exclude-tags:
   - private
+  exclude-tags:
   - common
+  - public
+  - participating
+  - nonparticipating
   type-mappings:
     integer: uint64
   skip-prune: true

diff --git a/daemon/algod/api/server/v2/generated/data/routes.go b/daemon/algod/api/server/v2/generated/data/routes.go
diff --git a/daemon/algod/api/server/v2/generated/nonparticipating/private/private_routes.yml b/daemon/algod/api/server/v2/generated/nonparticipating/private/private_routes.yml
@@ -9,6 +9,7 @@ output-options:
   exclude-tags:
   - public
   - participating
+  - data
   - common
   type-mappings:
     integer: uint64

diff --git a/daemon/algod/api/server/v2/generated/nonparticipating/private/routes.go b/daemon/algod/api/server/v2/generated/nonparticipating/private/routes.go
diff --git a/daemon/algod/api/server/v2/generated/nonparticipating/public/public_routes.yml b/daemon/algod/api/server/v2/generated/nonparticipating/public/public_routes.yml
@@ -10,6 +10,7 @@ output-options:
   - private
   - common
   - participating
+  - data
   type-mappings:
     integer: uint64
   skip-prune: true

diff --git a/daemon/algod/api/server/v2/generated/participating/private/private_routes.yml b/daemon/algod/api/server/v2/generated/participating/private/private_routes.yml
@@ -9,6 +9,7 @@ output-options:
   exclude-tags:
   - public
   - nonparticipating
+  - data
   - common
   type-mappings:
     integer: uint64