Skip to content

docs: various improvements (backport #1603)#1614

Merged
melekes merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1603
Nov 17, 2023
Merged

docs: various improvements (backport #1603)#1614
melekes merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1603

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 15, 2023

This is an automatic backport of pull request #1603 done by Mergify.
Cherry-pick of a05b73e has failed:

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

You are currently cherry-picking commit a05b73ee7.
  (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:   docs/guides/go.md
	modified:   docs/guides/install.md
	modified:   docs/introduction/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/guides/go-built-in.md

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

* docs: fix Query return parameters

* docs: fix the number of ABCI connections

ABCI creates 4 connections, not 3

* docs: bump cleveldb version

1.20 is 6 years old! 1.23 was released on Feb 24, 2021

* docs: remove check from PrepareProposal

This check only confuses readers. PrepareProposal returns
`proposal.Txs` (original list), not `txs`. Thus for loop is essentially
noop and can be removed. Even if we modify PrepareProposal to return
txs, it confuses application devs since CometBFT respects the limit when
creating a proposal! Therefore, application devs should only check the
limit when modifying the transactions, which is not the case here.

* docs: minor highlighting

* docs: fix syntax error

missing comma

* docs: fix gogoproto@v1.4.6/proto/merge.go:123:28: type error

go: go1.21.3 darwin/amd64
cometbft: v0.38.0

```
../../../go/pkg/mod/github.com/cosmos/gogoproto@v1.4.6/proto/merge.go:123:28:
type func(x *descriptorpb.FileDescriptorProto, y
*descriptorpb.FileDescriptorProto) bool of func(x, y
*descriptorpb.FileDescriptorProto) bool {…} does not match inferred type
func(a *descriptorpb.FileDescriptorProto, b
*descriptorpb.FileDescriptorProto) int for func(a E, b E) int
```

* docs: add missing double quote

* docs: make the same changes in go guide

- add a note about gogoproto
- simplify PrepareProposal
- add missing double quote

* docs: remove XXX

will create a separate PR updating gogoproto for v0.38

* Revert "docs: remove XXX"

This reverts commit a4a1a04.

(cherry picked from commit a05b73e)

# Conflicts:
#	docs/guides/go-built-in.md
@mergify mergify bot requested a review from a team as a code owner November 15, 2023 05:15
@mergify mergify bot added the conflicts label Nov 15, 2023
@melekes melekes self-assigned this Nov 15, 2023
@melekes melekes merged commit 1e3fd31 into v0.38.x Nov 17, 2023
@melekes melekes deleted the mergify/bp/v0.38.x/pr-1603 branch November 17, 2023 08:59
g3ndo9kar9 pushed a commit to g3ndo9kar9/cometbft that referenced this pull request Nov 28, 2023
* docs: various improvements (cometbft#1603)

* docs: fix Query return parameters

* docs: fix the number of ABCI connections

ABCI creates 4 connections, not 3

* docs: bump cleveldb version

1.20 is 6 years old! 1.23 was released on Feb 24, 2021

* docs: remove check from PrepareProposal

This check only confuses readers. PrepareProposal returns
`proposal.Txs` (original list), not `txs`. Thus for loop is essentially
noop and can be removed. Even if we modify PrepareProposal to return
txs, it confuses application devs since CometBFT respects the limit when
creating a proposal! Therefore, application devs should only check the
limit when modifying the transactions, which is not the case here.

* docs: minor highlighting

* docs: fix syntax error

missing comma

* docs: fix gogoproto@v1.4.6/proto/merge.go:123:28: type error

go: go1.21.3 darwin/amd64
cometbft: v0.38.0

```
../../../go/pkg/mod/github.com/cosmos/gogoproto@v1.4.6/proto/merge.go:123:28:
type func(x *descriptorpb.FileDescriptorProto, y
*descriptorpb.FileDescriptorProto) bool of func(x, y
*descriptorpb.FileDescriptorProto) bool {…} does not match inferred type
func(a *descriptorpb.FileDescriptorProto, b
*descriptorpb.FileDescriptorProto) int for func(a E, b E) int
```

* docs: add missing double quote

* docs: make the same changes in go guide

- add a note about gogoproto
- simplify PrepareProposal
- add missing double quote

* docs: remove XXX

will create a separate PR updating gogoproto for v0.38

* Revert "docs: remove XXX"

This reverts commit a4a1a04.

(cherry picked from commit a05b73e)

# Conflicts:
#	docs/guides/go-built-in.md

* fix merge conflict

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
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.

2 participants