Skip to content

fix: avoid recursive call after rename to (*PeerState).MarshalJSON (backport #865)#969

Merged
sergio-mena merged 1 commit intov0.37.xfrom
mergify/bp/v0.37.x/pr-865
Jun 14, 2023
Merged

fix: avoid recursive call after rename to (*PeerState).MarshalJSON (backport #865)#969
sergio-mena merged 1 commit intov0.37.xfrom
mergify/bp/v0.37.x/pr-865

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2023

This is an automatic backport of pull request #865 done by Mergify.


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

)

* avoid recursive call after rename to (*PeerState).MarshalJSON

* add test

* add change doc

* explain for nolint

* fix lint

* fix golangci-lint to v1.52.2

* fix golangci-lint to v1.52.2

* Revert "fix golangci-lint to v1.52.2"

This reverts commit 598a9ef.

* Revert "fix golangci-lint to v1.52.2"

This reverts commit a8aad12.

* Reintroduced `cmtjson`

* Avoid copying Mutex

* Avoid copying Mutex -- 2nd try, more succint

* Update .changelog/unreleased/bug-fixes/865-fix-peerstate-marshaljson.md

* Update consensus/reactor_test.go

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
(cherry picked from commit f6ea091)
@mergify mergify bot requested a review from a team as a code owner June 14, 2023 13:29
@sergio-mena sergio-mena self-assigned this Jun 14, 2023
@sergio-mena sergio-mena added the bug Something isn't working label Jun 14, 2023
@sergio-mena sergio-mena merged commit 9a453da into v0.37.x Jun 14, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-865 branch June 14, 2023 13:42
DongLieu pushed a commit to DongCoNY/cometbft that referenced this pull request May 13, 2024
…ometbft#865) (cometbft#969)

* avoid recursive call after rename to (*PeerState).MarshalJSON

* add test

* add change doc

* explain for nolint

* fix lint

* fix golangci-lint to v1.52.2

* fix golangci-lint to v1.52.2

* Revert "fix golangci-lint to v1.52.2"

This reverts commit 598a9ef.

* Revert "fix golangci-lint to v1.52.2"

This reverts commit a8aad12.

* Reintroduced `cmtjson`

* Avoid copying Mutex

* Avoid copying Mutex -- 2nd try, more succint

* Update .changelog/unreleased/bug-fixes/865-fix-peerstate-marshaljson.md

* Update consensus/reactor_test.go

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
(cherry picked from commit f6ea091)

Co-authored-by: mmsqe <mavis@crypto.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants