Skip to content

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

Merged
algorandskiy merged 2 commits intoalgorand:masterfrom
algorandskiy:pavel/codegen-build-fix
Nov 8, 2023
Merged

build: regenerate api routes and resolve merge error in catchup#5821
algorandskiy merged 2 commits intoalgorand:masterfrom
algorandskiy:pavel/codegen-build-fix

Conversation

@algorandskiy
Copy link
Copy Markdown
Contributor

@algorandskiy algorandskiy commented Nov 8, 2023

Summary

Somehow the latest merge caused codegen checker error, this regenerates stuff.

Regenerated with

touch daemon/algod/api/algod.oas2.json
make -C daemon/algod/api generate

Also there are two conflicting catchup PRs were merged causing error usage that was changed. Fixed as well.

@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 8, 2023

Codecov Report

Merging #5821 (9871314) into master (7ebb9f4) will increase coverage by 0.00%.
Report is 2 commits behind head on master.
The diff coverage is 67.64%.

@@           Coverage Diff           @@
##           master    #5821   +/-   ##
=======================================
  Coverage   55.60%   55.60%           
=======================================
  Files         475      475           
  Lines       66921    66946   +25     
=======================================
+ Hits        37209    37228   +19     
- Misses      27187    27198   +11     
+ Partials     2525     2520    -5     
Files Coverage Δ
catchup/peerSelector.go 98.71% <100.00%> (-1.29%) ⬇️
catchup/service.go 70.96% <50.00%> (+0.63%) ⬆️

... and 14 files with indirect coverage changes

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

winder
winder previously approved these changes Nov 8, 2023
Comment thread daemon/algod/api/algod.oas3.yml Outdated
@algorandskiy algorandskiy force-pushed the pavel/codegen-build-fix branch from 1472bd6 to 9871314 Compare November 8, 2023 16:32
@algorandskiy algorandskiy changed the title daemon: regenarate routes daemon: regenerate routes Nov 8, 2023
@algorandskiy algorandskiy requested review from cce and winder November 8, 2023 16:34
Comment thread catchup/service.go
Copy link
Copy Markdown
Contributor

@winder winder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these changes look fine. One of them doesn't match the current description/title.

@algorandskiy algorandskiy changed the title daemon: regenerate routes build: regenerate api routes and resolve merge error in catchup Nov 8, 2023
@algorandskiy algorandskiy merged commit 3605084 into algorand:master Nov 8, 2023
@algorandskiy algorandskiy deleted the pavel/codegen-build-fix branch March 16, 2026 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants