Skip to content
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.

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

Remove useless whitespace in Websocket output (backport #9720) #9723

Open
wants to merge 2 commits into
base: v0.37.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2022

This is an automatic backport of pull request #9720 done by Mergify.
Cherry-pick of 20ffa4f has failed:

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

You are currently cherry-picking commit 20ffa4fd3.
  (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:   rpc/jsonrpc/server/http_server.go
	modified:   rpc/jsonrpc/server/ws_handler.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG_PENDING.md
	both modified:   rpc/jsonrpc/server/http_server_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

* First try at #9696

* Brief explanation

* Removed all prettified JSON RPC responses

* Fixes for failing tests.

Adapted the assertions in
- TestWriteRPCResponseHTTP
- TestWriteRPCResponseHTTPError
to work with non-pretty JSON-RPC output

* Added changelog pending entry

* Update CHANGELOG_PENDING.md

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 20ffa4f)

# Conflicts:
#	CHANGELOG_PENDING.md
#	rpc/jsonrpc/server/http_server_test.go
@mergify mergify bot requested a review from ebuchman as a code owner November 20, 2022 14:39
@mergify mergify bot requested a review from a team November 20, 2022 14:39
@mergify mergify bot added the conflicts label Nov 20, 2022
@thanethomson
Copy link
Contributor

@Mergifyio backport mergify/bp/v0.37.x/pr-9650

@mergify
Copy link
Contributor Author

mergify bot commented Nov 20, 2022

backport mergify/bp/v0.37.x/pr-9650

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@thanethomson thanethomson added the S:wip Work in progress (prevents stalebot from automatically closing) label Nov 20, 2022
@thanethomson
Copy link
Contributor

@Mergifyio rebase v0.37.x

@mergify
Copy link
Contributor Author

mergify bot commented Nov 20, 2022

rebase v0.37.x

✅ Nothing to do for rebase action

@thanethomson
Copy link
Contributor

thanethomson commented Nov 20, 2022

This PR should be rebased after we merge #9665. That should fix the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts S:wip Work in progress (prevents stalebot from automatically closing)
Projects
Status: Blocked
Development

Successfully merging this pull request may close these issues.

None yet

3 participants