build: regenerate api routes and resolve merge error in catchup (algo…

…rand#5821)
onetechnical · Nov 8, 2023 · 3605084 · 3605084
1 parent 03efd42
commit 3605084
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 420 deletions.
diff --git a/catchup/service.go b/catchup/service.go
@@ -310,7 +310,8 @@ func (s *Service) fetchAndWrite(ctx context.Context, r basics.Round, prevFetchCo
 				return false
 			}
 			failureRank := peerRankDownloadFailed
-			if err == errNoBlockForRound {
+			var nbfe noBlockForRoundError
+			if errors.As(err, &nbfe) {
 				failureRank = peerRankNoBlockForRound
 				// remote peer doesn't have the block, try another peer
 				// quit if the the same peer peer encountered errNoBlockForRound more than errNoBlockForRoundThreshold times
@@ -731,7 +732,8 @@ func (s *Service) fetchRound(cert agreement.Certificate, verifier *agreement.Asy
 			default:
 			}
 			failureRank := peerRankDownloadFailed
-			if err == errNoBlockForRound {
+			var nbfe noBlockForRoundError
+			if errors.As(err, &nbfe) {
 				failureRank = peerRankNoBlockForRound
 				// If a peer does not have the block after few attempts it probably has not persisted the block yet.
 				// Give it some time to persist the block and try again.

diff --git a/daemon/algod/api/algod.oas3.yml b/daemon/algod/api/algod.oas3.yml
@@ -7192,5 +7192,6 @@
     {
       "name": "private"
     }
-  ]
+  ],
+  "x-original-swagger-version": "2.0"
 }
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/experimental/routes.go b/daemon/algod/api/server/v2/generated/experimental/routes.go
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/routes.go b/daemon/algod/api/server/v2/generated/nonparticipating/public/routes.go
diff --git a/daemon/algod/api/server/v2/generated/participating/private/routes.go b/daemon/algod/api/server/v2/generated/participating/private/routes.go
diff --git a/daemon/algod/api/server/v2/generated/participating/public/routes.go b/daemon/algod/api/server/v2/generated/participating/public/routes.go
diff --git a/data/transactions/logic/Makefile b/data/transactions/logic/Makefile
@@ -19,7 +19,7 @@ fields_string.go:	fields.go
 	go generate
 
 README.md:	TEAL_opcodes.md README_in.md
-	python merge.py > README.md
+	python3 merge.py > README.md
 	@if [ -e $(SPECS)/dev/TEAL.md ]; then \
 		sed '/^$$/q' $(SPECS)/dev/TEAL.md | cat - README.md > teal.spec; \
 		mv teal.spec $(SPECS)/dev/TEAL.md; \
-Original file line number
+Diff line change
@@ Expand Up / @@ -7192,5 +7192,6 @@ @@
         {
           "name": "private"
         }
-      ]
+      ],
+      "x-original-swagger-version": "2.0"
     }