Skip to content

rpc: implement header and header_by_hash queries (backport #7270)#7367

Merged
cmwaters merged 3 commits intov0.35.xfrom
mergify/bp/v0.35.x/pr-7270
Dec 2, 2021
Merged

rpc: implement header and header_by_hash queries (backport #7270)#7367
cmwaters merged 3 commits intov0.35.xfrom
mergify/bp/v0.35.x/pr-7270

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 2, 2021

This is an automatic backport of pull request #7270 done by Mergify.
Cherry-pick of 5f57d84 has failed:

On branch mergify/bp/v0.35.x/pr-7270
Your branch is up to date with 'origin/v0.35.x'.

You are currently cherry-picking commit 5f57d84dd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/consensus/replay_test.go
	modified:   internal/rpc/core/blocks.go
	modified:   internal/rpc/core/blocks_test.go
	modified:   internal/rpc/core/routes.go
	modified:   internal/state/mocks/block_store.go
	modified:   internal/state/services.go
	modified:   internal/store/store.go
	modified:   light/proxy/routes.go
	modified:   light/rpc/client.go
	modified:   rpc/client/http/http.go
	modified:   rpc/client/interface.go
	modified:   rpc/client/local/local.go
	modified:   rpc/coretypes/responses.go
	modified:   rpc/openapi/openapi.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG_PENDING.md
	deleted by us:   rpc/client/mocks/client.go
	both modified:   rpc/client/rpc_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@fedekunze
rpc: implement header and header_by_hash queries (#7270)
ec25083 
(cherry picked from commit 5f57d84)

# Conflicts:
#	CHANGELOG_PENDING.md
#	rpc/client/mocks/client.go
#	rpc/client/rpc_test.go
@mergify mergify bot added the conflicts label Dec 2, 2021
@cmwaters cmwaters merged commit b4396d7 into v0.35.x Dec 2, 2021
@cmwaters cmwaters deleted the mergify/bp/v0.35.x/pr-7270 branch December 2, 2021 13:13
lklimek referenced this pull request in dashpay/tenderdash Mar 28, 2022
@mergify @lklimek
rpc: implement header and header_by_hash queries (backport #7270) (#7…
0f97da5 
…367)

(cherry picked from commit b4396d7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@creachadair creachadair Awaiting requested review from creachadair

@ebuchman ebuchman Awaiting requested review from ebuchman

@tychoish tychoish Awaiting requested review from tychoish

@williambanfield williambanfield Awaiting requested review from williambanfield

1 more reviewer

@cmwaters cmwaters cmwaters approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cmwaters @fedekunze