Skip to content

revert(internal): Implement ADR 114 by making several modules public again (backport #3004)#3011

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-3004
May 6, 2024
Merged

revert(internal): Implement ADR 114 by making several modules public again (backport #3004)#3011
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-3004

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 6, 2024

Closes #2990

The following modules are no longer in internal:

  • libs/pubsub
  • libs/protoio
  • libs/service
  • libs/sync
  • statesync

We also:

  • added "XXX deprecated" marker in the above modules
  • undid the .changelog entry that stated these modules are "Move to internal", since that is no longer true

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec
This is an automatic backport of pull request #3004 done by [Mergify](https://mergify.com).

@adizere @mergify
revert(internal): Implement ADR 114 by making several modules public …
2f1d595 
…again (#3004)

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

Closes #2990

---

The following modules are no longer in `internal`:

- [x] `libs/pubsub`
- [x] `libs/protoio`
- [x] `libs/service`
- [x] `libs/sync`
- [x] `statesync`

We also:

- [x] added "XXX deprecated" marker in the above modules
- [x] undid the .changelog entry that stated these modules are "Move to
`internal`", since that is no longer true

#### PR checklist

- [ ] ~~Tests written/updated~~
- [ ] ~~Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)~~
- [ ] ~~Updated relevant documentation (`docs/` or `spec/`) and code
comments~~
- [x] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

---------

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit 34e5c05)

# Conflicts:
#	rpc/core/tx.go
@mergify
Copy link
Contributor Author

mergify bot commented May 6, 2024

Cherry-pick of 34e5c05 has failed:

On branch mergify/bp/v1.x/pr-3004
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit 34e5c05a5.
  (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:
	deleted:    .changelog/unreleased/breaking-changes/1485-libs-protoio-internalize.md
	deleted:    .changelog/unreleased/breaking-changes/1485-libs-pubsub-internalize.md
	deleted:    .changelog/unreleased/breaking-changes/1485-libs-service-internalize.md
	deleted:    .changelog/unreleased/breaking-changes/1485-libs-sync-internalize.md
	deleted:    .changelog/unreleased/breaking-changes/1485-statesync-internalize.md
	modified:   abci/client/client.go
	modified:   abci/client/grpc_client.go
	modified:   abci/client/local_client.go
	modified:   abci/client/socket_client.go
	modified:   abci/client/socket_client_test.go
	modified:   abci/client/unsync_local_client.go
	modified:   abci/server/grpc_server.go
	modified:   abci/server/server.go
	modified:   abci/server/socket_server.go
	modified:   abci/types/messages.go
	modified:   config/db.go
	modified:   docs/references/architecture/adr-114-undo-109.md
	modified:   internal/autofile/group.go
	modified:   internal/blocksync/pool.go
	modified:   internal/clist/clist.go
	modified:   internal/cmap/cmap.go
	modified:   internal/consensus/byzantine_test.go
	modified:   internal/consensus/common_test.go
	modified:   internal/consensus/pbts_test.go
	modified:   internal/consensus/reactor.go
	modified:   internal/consensus/reactor_test.go
	modified:   internal/consensus/state.go
	modified:   internal/consensus/state_test.go
	modified:   internal/consensus/ticker.go
	modified:   internal/consensus/wal.go
	modified:   internal/events/events.go
	modified:   internal/flowrate/flowrate.go
	modified:   internal/inspect/inspect_test.go
	modified:   internal/rand/random.go
	modified:   internal/tempfile/tempfile.go
	modified:   internal/timer/throttle_timer.go
	modified:   internal/timer/throttle_timer_test.go
	modified:   libs/json/structs.go
	modified:   libs/json/types.go
	renamed:    internal/protoio/io.go -> libs/protoio/io.go
	renamed:    internal/protoio/io_test.go -> libs/protoio/io_test.go
	renamed:    internal/protoio/reader.go -> libs/protoio/reader.go
	renamed:    internal/protoio/writer.go -> libs/protoio/writer.go
	renamed:    internal/pubsub/example_test.go -> libs/pubsub/example_test.go
	renamed:    internal/pubsub/pubsub.go -> libs/pubsub/pubsub.go
	renamed:    internal/pubsub/pubsub_test.go -> libs/pubsub/pubsub_test.go
	renamed:    internal/pubsub/query/.gitignore -> libs/pubsub/query/.gitignore
	renamed:    internal/pubsub/query/bench_test.go -> libs/pubsub/query/bench_test.go
	renamed:    internal/pubsub/query/query.go -> libs/pubsub/query/query.go
	renamed:    internal/pubsub/query/query_test.go -> libs/pubsub/query/query_test.go
	renamed:    internal/pubsub/query/syntax/doc.go -> libs/pubsub/query/syntax/doc.go
	renamed:    internal/pubsub/query/syntax/parser.go -> libs/pubsub/query/syntax/parser.go
	renamed:    internal/pubsub/query/syntax/scanner.go -> libs/pubsub/query/syntax/scanner.go
	renamed:    internal/pubsub/query/syntax/syntax_test.go -> libs/pubsub/query/syntax/syntax_test.go
	renamed:    internal/pubsub/subscription.go -> libs/pubsub/subscription.go
	renamed:    internal/service/service.go -> libs/service/service.go
	renamed:    internal/service/service_test.go -> libs/service/service_test.go
	renamed:    internal/sync/deadlock.go -> libs/sync/deadlock.go
	renamed:    internal/sync/sync.go -> libs/sync/sync.go
	modified:   light/client.go
	modified:   light/proxy/proxy.go
	modified:   light/rpc/client.go
	modified:   light/store/db/db.go
	modified:   mempool/cache.go
	modified:   mempool/clist_mempool.go
	modified:   mempool/clist_mempool_test.go
	modified:   mempool/nop_mempool.go
	modified:   mempool/reactor.go
	modified:   node/node.go
	modified:   node/setup.go
	modified:   p2p/base_reactor.go
	modified:   p2p/conn/connection.go
	modified:   p2p/conn/connection_test.go
	modified:   p2p/conn/evil_secret_connection_test.go
	modified:   p2p/conn/secret_connection.go
	modified:   p2p/conn_set.go
	modified:   p2p/fuzz.go
	modified:   p2p/mock/peer.go
	modified:   p2p/peer.go
	modified:   p2p/peer_set.go
	modified:   p2p/peer_set_test.go
	modified:   p2p/pex/addrbook.go
	modified:   p2p/pex/pex_reactor.go
	modified:   p2p/switch.go
	modified:   p2p/switch_test.go
	modified:   p2p/transport.go
	modified:   p2p/transport_test.go
	modified:   privval/file.go
	modified:   privval/signer_dialer_endpoint.go
	modified:   privval/signer_endpoint.go
	modified:   privval/signer_listener_endpoint.go
	modified:   privval/signer_server.go
	modified:   proxy/client.go
	modified:   proxy/multi_app_conn.go
	modified:   rpc/client/http/http.go
	modified:   rpc/client/interface.go
	modified:   rpc/client/local/local.go
	modified:   rpc/client/mock/client.go
	modified:   rpc/core/blocks.go
	modified:   rpc/core/events.go
	modified:   rpc/grpc/server/services/blockservice/service.go
	modified:   rpc/jsonrpc/client/http_json_client.go
	modified:   rpc/jsonrpc/client/ws_client.go
	modified:   rpc/jsonrpc/client/ws_client_test.go
	modified:   rpc/jsonrpc/server/ws_handler.go
	modified:   state/indexer/block.go
	modified:   state/indexer/block/kv/kv.go
	modified:   state/indexer/block/kv/kv_test.go
	modified:   state/indexer/block/kv/util.go
	modified:   state/indexer/block/null/null.go
	modified:   state/indexer/mocks/block_indexer.go
	modified:   state/indexer/query_range.go
	modified:   state/indexer/sink/psql/backport.go
	modified:   state/indexer/sink/psql/psql.go
	modified:   state/pruner.go
	modified:   state/pruner_test.go
	modified:   state/txindex/indexer.go
	modified:   state/txindex/indexer_service.go
	modified:   state/txindex/kv/kv.go
	modified:   state/txindex/kv/kv_bench_test.go
	modified:   state/txindex/kv/kv_test.go
	modified:   state/txindex/kv/utils.go
	modified:   state/txindex/mocks/tx_indexer.go
	modified:   state/txindex/null/null.go
	renamed:    internal/statesync/chunks.go -> statesync/chunks.go
	renamed:    internal/statesync/chunks_test.go -> statesync/chunks_test.go
	renamed:    internal/statesync/messages.go -> statesync/messages.go
	renamed:    internal/statesync/messages_test.go -> statesync/messages_test.go
	renamed:    internal/statesync/metrics.gen.go -> statesync/metrics.gen.go
	renamed:    internal/statesync/metrics.go -> statesync/metrics.go
	renamed:    internal/statesync/mocks/state_provider.go -> statesync/mocks/state_provider.go
	renamed:    internal/statesync/reactor.go -> statesync/reactor.go
	renamed:    internal/statesync/reactor_test.go -> statesync/reactor_test.go
	renamed:    internal/statesync/snapshots.go -> statesync/snapshots.go
	renamed:    internal/statesync/snapshots_test.go -> statesync/snapshots_test.go
	renamed:    internal/statesync/stateprovider.go -> statesync/stateprovider.go
	renamed:    internal/statesync/syncer.go -> statesync/syncer.go
	renamed:    internal/statesync/syncer_test.go -> statesync/syncer_test.go
	renamed:    internal/statesync/types.go -> statesync/types.go
	modified:   store/store.go
	modified:   test/e2e/app/app.go
	modified:   test/fuzz/tests/mempool_test.go
	modified:   types/block.go
	modified:   types/event_bus.go
	modified:   types/event_bus_test.go
	modified:   types/events.go
	modified:   types/part_set.go
	modified:   types/proposal.go
	modified:   types/proposal_test.go
	modified:   types/vote.go
	modified:   types/vote_set.go
	modified:   types/vote_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rpc/core/tx.go

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

@mergify mergify bot requested a review from a team as a code owner May 6, 2024 05:54
@mergify mergify bot requested a review from a team May 6, 2024 05:54
@mergify mergify bot added the conflicts label May 6, 2024
@melekes melekes merged commit 75df622 into v1.x May 6, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-3004 branch May 6, 2024 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@melekes melekes melekes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@melekes @sergio-mena @adizere