0.34.x: Rename Tendermint to CometBFT: further actions (backport #224) by mergify[bot] · Pull Request #255 · cometbft/cometbft

mergify · 2023-02-01T16:33:06Z

This is an automatic backport of pull request #224 done by Mergify.
Cherry-pick of 1cb55d4 has failed:

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

You are currently cherry-picking commit 1cb55d49b.
  (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:   .github/ISSUE_TEMPLATE/feature-request.md
	modified:   .github/ISSUE_TEMPLATE/proposal.md
	modified:   .github/workflows/pre-release.yml
	modified:   .github/workflows/release.yml
	deleted:    Vagrantfile
	modified:   abci/example/kvstore/README.md
	modified:   abci/types/types.pb.go
	deleted:    appveyor.yml
	modified:   consensus/wal_generator.go
	deleted:    crypto/CHANGELOG.md
	modified:   crypto/doc.go
	modified:   crypto/example_test.go
	modified:   crypto/merkle/proof_value.go
	modified:   crypto/sr25519/privkey.go
	deleted:    libs/CHANGELOG.md
	modified:   libs/cli/setup.go
	modified:   libs/events/Makefile
	modified:   libs/events/README.md
	modified:   libs/json/doc.go
	modified:   libs/log/logger.go
	modified:   libs/log/tmfmt_logger.go
	modified:   light/detector.go
	modified:   light/example_test.go
	modified:   mempool/mempool.go
	modified:   p2p/netaddress.go
	modified:   p2p/node_info.go
	modified:   p2p/pex/addrbook.go
	modified:   p2p/upnp/probe.go
	modified:   privval/socket_listeners_test.go
	modified:   proto/tendermint/abci/types.proto
	modified:   proto/tendermint/crypto/keys.pb.go
	modified:   proto/tendermint/crypto/keys.proto
	modified:   proto/tendermint/types/types.pb.go
	modified:   proto/tendermint/types/types.proto
	modified:   proxy/multi_app_conn.go
	modified:   rpc/client/examples_test.go
	modified:   rpc/client/http/http.go
	modified:   rpc/client/interface.go
	modified:   rpc/client/local/local.go
	modified:   rpc/client/main_test.go
	modified:   rpc/client/mock/abci.go
	modified:   rpc/client/mock/client.go
	modified:   rpc/core/README.md
	modified:   rpc/grpc/grpc_test.go
	modified:   rpc/jsonrpc/server/http_uri_handler.go
	modified:   rpc/jsonrpc/server/ws_handler.go
	modified:   rpc/openapi/index.html
	modified:   rpc/test/helpers.go
	modified:   scripts/dist.sh
	modified:   scripts/json2wal/main.go
	modified:   scripts/linkify_changelog.py
	modified:   scripts/proto-gen.sh
	modified:   scripts/qa/reporting/README.md
	modified:   scripts/qa/reporting/latency_throughput.py
	modified:   state/errors.go
	modified:   state/execution.go
	modified:   state/indexer/sink/psql/backport.go
	modified:   state/indexer/sink/psql/psql.go
	modified:   state/indexer/sink/psql/schema.sql
	modified:   state/rollback.go
	modified:   state/state.go
	modified:   state/store.go
	modified:   statesync/syncer.go
	modified:   store/store_test.go
	modified:   test/README.md
	modified:   test/loadtime/Makefile
	modified:   test/loadtime/README.md
	modified:   test/loadtime/cmd/report/main.go
	modified:   test/loadtime/report/report.go
	modified:   test/test_cover.sh
	modified:   tests.mk
	modified:   types/block.go
	modified:   types/evidence.go
	modified:   types/genesis.go
	modified:   types/priv_validator.go
	modified:   types/protobuf.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/ISSUE_TEMPLATE/bug-report.md
	deleted by us:   .github/ISSUE_TEMPLATE/config.yml
	both modified:   .github/PULL_REQUEST_TEMPLATE.md
	deleted by us:   .github/issue_template.md
	deleted by us:   .github/workflows/janitor.yml
	both modified:   .github/workflows/lint.yml
	both modified:   .gitignore
	both modified:   .goreleaser.yml
	both modified:   UPGRADING.md
	both modified:   abci/README.md
	both modified:   abci/types/application.go
	deleted by us:   abci/types/mocks/base.go
	both modified:   cmd/cometbft/commands/version.go
	both modified:   config/config.go
	both modified:   config/toml.go
	both modified:   consensus/README.md
	both modified:   consensus/replay.go
	both modified:   consensus/replay_test.go
	both modified:   consensus/state.go
	both modified:   crypto/README.md
	both modified:   crypto/ed25519/ed25519.go
	deleted by us:   inspect/doc.go
	deleted by us:   inspect/inspect.go
	deleted by us:   internal/test/doc.go
	both modified:   libs/pubsub/query/query.go
	deleted by us:   libs/pubsub/query/syntax/doc.go
	both modified:   light/doc.go
	both modified:   networks/local/README.md
	both modified:   node/node.go
	deleted by us:   node/setup.go
	both modified:   p2p/README.md
	both modified:   proto/README.md
	both modified:   rpc/core/abci.go
	both modified:   rpc/core/blocks.go
	both modified:   rpc/core/consensus.go
	both modified:   rpc/core/doc.go
	both modified:   rpc/core/events.go
	both modified:   rpc/core/evidence.go
	both modified:   rpc/core/health.go
	both modified:   rpc/core/mempool.go
	both modified:   rpc/core/net.go
	both modified:   rpc/core/status.go
	both modified:   rpc/core/tx.go
	both modified:   rpc/jsonrpc/doc.go
	both modified:   rpc/openapi/openapi.yaml
	deleted by us:   scripts/metricsgen/metricsgen.go
	both modified:   test/fuzz/README.md
	deleted by us:   test/fuzz/oss-fuzz-build.sh
	both modified:   test/loadtime/cmd/load/main.go
	both modified:   tools/README.md
	both modified:   version/version.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

* rename: Tendermint -> CometBFT in README files * rename: Tendermint -> CometBFT in doc.go files * rename: Tendermint -> CometBFT in Go documentation * Removing unused/outdated CHANGELOGs * rename: using CometBFT in issues and PR templates * rename: references to tendermin in libs/events * rename: renaming on text files under rpc/ dir * rename: Tendermint-go -> CometBFT in proto docs * rename: Tendermint -> CometBFT in generated go docs * rename: renaming Tendermint -> CometBFT in scripts * rename: renaming to CometBFT in code comments * rename: general script files on repository root * rename: using CometBFT in github config files * rename: Go docs in .proto files, pb.go regenerated * rename: toml config file generated content * rename: avoiding unnecessary TM entries in comments * rename: renaming in log messages and strings * rename: upgrading instructions renamed, needs review * rename: fixing generated protobuf files * rename: fixing generated protobuf files * rename: fixing broken test, renamed string * Apply suggestions from code review * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: Thane Thomson <connect@thanethomson.com> * Update abci/README.md Co-authored-by: Thane Thomson <connect@thanethomson.com> * Update proto/README.md Co-authored-by: Thane Thomson <connect@thanethomson.com> * rename: removing unused files on repo root --------- Co-authored-by: Daniel Cason <cason@gandria> Co-authored-by: Thane Thomson <connect@thanethomson.com> (cherry picked from commit 1cb55d4) # Conflicts: # .github/ISSUE_TEMPLATE/bug-report.md # .github/ISSUE_TEMPLATE/config.yml # .github/PULL_REQUEST_TEMPLATE.md # .github/issue_template.md # .github/workflows/janitor.yml # .github/workflows/lint.yml # .gitignore # .goreleaser.yml # UPGRADING.md # abci/README.md # abci/types/application.go # abci/types/mocks/base.go # cmd/cometbft/commands/version.go # config/config.go # config/toml.go # consensus/README.md # consensus/replay.go # consensus/replay_test.go # consensus/state.go # crypto/README.md # crypto/ed25519/ed25519.go # inspect/doc.go # inspect/inspect.go # internal/test/doc.go # libs/pubsub/query/query.go # libs/pubsub/query/syntax/doc.go # light/doc.go # networks/local/README.md # node/node.go # node/setup.go # p2p/README.md # proto/README.md # rpc/core/abci.go # rpc/core/blocks.go # rpc/core/consensus.go # rpc/core/doc.go # rpc/core/events.go # rpc/core/evidence.go # rpc/core/health.go # rpc/core/mempool.go # rpc/core/net.go # rpc/core/status.go # rpc/core/tx.go # rpc/jsonrpc/doc.go # rpc/openapi/openapi.yaml # scripts/metricsgen/metricsgen.go # test/fuzz/README.md # test/fuzz/oss-fuzz-build.sh # test/loadtime/cmd/load/main.go # tools/README.md # version/version.go

UPGRADING.md

abci/types/mocks/base.go

config/config.go

version/version.go

Co-authored-by: Jasmina Malicevic <jasmina@informal.systems>

config/toml.go

p2p/README.md

cason · 2023-02-06T13:28:20Z

rpc/core/blocks.go

 ) (*ctypes.ResultBlockSearch, error) {
 	if matchEvents {
 		query = "match.events = 1 AND " + query
+	} else {


This was removed in the cherry-pick, re-adding.

cason · 2023-02-06T13:29:00Z

rpc/core/tx.go


 	if matchEvents {
 		query = "match.events = 1 AND " + query
+	} else {


Removed during the process, re-added.

crypto/ed25519/ed25519.go

crypto/sr25519/privkey.go

libs/events/README.md

codecov-commenter · 2023-02-06T14:03:20Z

Codecov Report

Base: 48.45% // Head: 48.39% // Decreases project coverage by -0.06% ⚠️

Coverage data is based on head (26c5644) compared to base (260c8de).
Patch coverage: 46.15% of modified lines in pull request are covered.

❗ Current head 26c5644 differs from pull request most recent head 8d9fd04. Consider uploading reports for the commit 8d9fd04 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files

@@             Coverage Diff             @@
##           v0.34.x     #255      +/-   ##
===========================================
- Coverage    48.45%   48.39%   -0.06%     
===========================================
  Files          280      280              
  Lines        49887    49887              
===========================================
- Hits         24172    24144      -28     
- Misses       23856    23882      +26     
- Partials      1859     1861       +2

Impacted Files	Coverage Δ
abci/types/application.go	`0.00% <ø> (ø)`
abci/types/types.pb.go	`3.27% <ø> (ø)`
cmd/cometbft/commands/version.go	`8.69% <0.00%> (ø)`
consensus/state.go	`70.60% <0.00%> (+0.43%)`	⬆️
consensus/wal_generator.go	`71.12% <0.00%> (ø)`
crypto/ed25519/ed25519.go	`43.54% <ø> (ø)`
crypto/merkle/proof_value.go	`0.00% <ø> (ø)`
crypto/sr25519/privkey.go	`52.54% <ø> (ø)`
libs/cli/setup.go	`69.04% <ø> (ø)`
libs/events/events.go	`93.23% <ø> (-5.27%)`	⬇️
... and 54 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

From myself.

UPGRADING.md

cason · 2023-02-06T16:56:15Z

Issue #280 should cover more complex renaming in this branch.

jmalicevic · 2023-02-06T22:04:23Z

abci/types/types.pb.go

 	Sender    string  `protobuf:"bytes,9,opt,name=sender,proto3" json:"sender,omitempty"`
 	Priority  int64   `protobuf:"varint,10,opt,name=priority,proto3" json:"priority,omitempty"`
-	// mempool_error is set by Tendermint.
+	// mempool_error is set by CometBFT.


This was autogenerated right, the PR is not manually changing this?

Yep, generated using make something.

spec/abci/client-server.md

jmalicevic

Minor comments, otherwise looks good, as long as CI does not complain :)

mergify bot requested a review from a team as a code owner February 1, 2023 16:33

mergify bot added the conflicts label Feb 1, 2023

cason changed the title ~~Rename Tendermint to CometBFT: further actions (backport #224)~~ 0.34.x: Rename Tendermint to CometBFT: further actions (backport #224) Feb 3, 2023

cason self-assigned this Feb 3, 2023

cason reviewed Feb 6, 2023

View reviewed changes

UPGRADING.md Outdated Show resolved Hide resolved

cason reviewed Feb 6, 2023

View reviewed changes

abci/types/mocks/base.go Outdated Show resolved Hide resolved

cason reviewed Feb 6, 2023

View reviewed changes

config/config.go Outdated Show resolved Hide resolved

cason reviewed Feb 6, 2023

View reviewed changes

version/version.go Outdated Show resolved Hide resolved

Daniel Cason and others added 3 commits February 6, 2023 11:26

rename: fixing cherry-pick conflicts

bea8e2a

rename: fixing cherry-pick conflicts

e23610e

Co-authored-by: Jasmina Malicevic <jasmina@informal.systems>

rename: fixing cherry-pick conflicts

ee7c84a

Co-authored-by: Jasmina Malicevic <jasmina@informal.systems>

cason reviewed Feb 6, 2023

View reviewed changes

config/toml.go Show resolved Hide resolved

cason reviewed Feb 6, 2023

View reviewed changes

p2p/README.md Show resolved Hide resolved

cason reviewed Feb 6, 2023

View reviewed changes

rpc/core/tx.go

if matchEvents {

query = "match.events = 1 AND " + query

} else {

Copy link

cason Feb 6, 2023

Choose a reason for hiding this comment

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

Removed during the process, re-added.

cason previously approved these changes Feb 6, 2023

View reviewed changes

Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-224

db553ab

jmalicevic reviewed Feb 6, 2023

View reviewed changes

crypto/ed25519/ed25519.go Show resolved Hide resolved

jmalicevic reviewed Feb 6, 2023

View reviewed changes

crypto/sr25519/privkey.go Show resolved Hide resolved

jmalicevic reviewed Feb 6, 2023

View reviewed changes

libs/events/README.md Outdated Show resolved Hide resolved

rename: reverted changes on UPGRADING.md

becfeb4

cason self-requested a review February 6, 2023 14:09

rename: Tendermint Core -> CometBFT on intro

b4e281d

cason reviewed Feb 6, 2023

View reviewed changes

UPGRADING.md Show resolved Hide resolved

rename: further renaming Tendermint -> CometBFT

2d038af

cason requested a review from a team as a code owner February 6, 2023 15:42

rename: Tendermint -> CometBFT under test/maverick/

bf0db55

Daniel Cason added 5 commits February 6, 2023 17:08

rename: further renaming Tendermint -> CometBFT

75840e1

rename: removing copyright from internal package

21b4f25

rename: Tendermint -> CometBFT in /spec/abci

387a8ae

Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-224

22e7908

rename: further renaming Tendermint -> CometBFT

16483e9

Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-224

0b3f21d

cason removed the conflicts label Feb 6, 2023

jmalicevic reviewed Feb 6, 2023

View reviewed changes

spec/abci/client-server.md Outdated Show resolved Hide resolved

jmalicevic approved these changes Feb 6, 2023

View reviewed changes

Daniel Cason added 4 commits February 7, 2023 08:17

rename: undoing renaming of jTendermint

d36a3e2

Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-224

a500777

rename: removing reference to tendermint/go-amino

26c5644

rename: tendermint -> cometbft on .circleci/

8d9fd04

cason merged commit b22a3a6 into v0.34.x Feb 7, 2023

cason deleted the mergify/bp/v0.34.x/pr-224 branch February 7, 2023 07:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

0.34.x: Rename Tendermint to CometBFT: further actions (backport #224)#255

0.34.x: Rename Tendermint to CometBFT: further actions (backport #224)#255
cason merged 19 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-224

mergify bot commented Feb 1, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cason Feb 6, 2023

Uh oh!

cason Feb 6, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Feb 6, 2023 •

edited

Loading

Uh oh!

Uh oh!

cason commented Feb 6, 2023

Uh oh!

jmalicevic Feb 6, 2023

Uh oh!

cason Feb 7, 2023

Uh oh!

Uh oh!

jmalicevic left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mergify bot commented Feb 1, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cason Feb 6, 2023

Choose a reason for hiding this comment

Uh oh!

cason Feb 6, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Feb 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

cason commented Feb 6, 2023

Uh oh!

jmalicevic Feb 6, 2023

Choose a reason for hiding this comment

Uh oh!

cason Feb 7, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jmalicevic left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented Feb 6, 2023 •

edited

Loading