Skip to content

build: regenerate api routes and resolve merge error in catchup #5821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algorandskiy merged 2 commits into from
Nov 8, 2023
Merged

build: regenerate api routes and resolve merge error in catchup #5821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f557a2
daemon: regenarate routes
algorandskiy Nov 8, 2023
9871314
fix noBlockForRoundError checks
algorandskiy Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions catchup/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Comment thread
algorandskiy marked this conversation as resolved.
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
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion daemon/algod/api/algod.oas3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7192,5 +7192,6 @@
{
"name": "private"
}
]
],
"x-original-swagger-version": "2.0"
Comment thread
algorandskiy marked this conversation as resolved.
Outdated
}
4 changes: 2 additions & 2 deletions daemon/algod/api/server/v2/generated/data/routes.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

408 changes: 204 additions & 204 deletions daemon/algod/api/server/v2/generated/experimental/routes.go
View file
Open in desktop

Large diffs are not rendered by default.

414 changes: 207 additions & 207 deletions daemon/algod/api/server/v2/generated/nonparticipating/private/routes.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion daemon/algod/api/server/v2/generated/nonparticipating/public/routes.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion daemon/algod/api/server/v2/generated/participating/private/routes.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion daemon/algod/api/server/v2/generated/participating/public/routes.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/transactions/logic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down