Resolve conflict in #986 #1004
Merged
Resolve conflict in #986 #1004
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Relocate ABCI test to fix broken doctest Signed-off-by: Thane Thomson <connect@thanethomson.com> * Use tokio_test for mock client doctest Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add CI test for default features Signed-off-by: Thane Thomson <connect@thanethomson.com>
* Add block_search RPC endpoint and tests * Add .changelog entry * Fix comments
Closes #998 * Bump integration test tendermint to v0.34.13 * Fix kvstore integration tests * Bump tendermint version to v0.34.13 in CI Signed-off-by: Thane Thomson <connect@thanethomson.com>
So far only the kvstore tests ran as part of the Github workfows. This would leave opportunity for changes to introduce breakage to the builds of the tools. In this change the same build and clippy stages are introduced for the tools workspace that currently run for the top-level one. Signed-off-by: xla <self@xla.is>
* Add missing block_search endpoint * Bump tendermint version to v0.34.13 Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Codecov Report
@@ Coverage Diff @@
## soares/move-tendermint-config #1004 +/- ##
===============================================================
Coverage ? 72.6%
===============================================================
Files ? 206
Lines ? 16665
Branches ? 0
===============================================================
Hits ? 12101
Misses ? 4564
Partials ? 0 Continue to review full report at Codecov.
|
soareschen
approved these changes
Oct 6, 2021
thanethomson
added a commit
that referenced
this pull request
Oct 7, 2021
* Move out tendermint::config to tendermint_config crate * Introduce own error type in tendermint-config * Move tendermint::net to tendermint_config::net * Fix tendermint-rpc error * Update Cargo.toml for tendermint-config * Remove #![allow(dead_code)] * Apply suggestions from code review Co-authored-by: Thane Thomson <thane@informal.systems> * Move tendermint_config::files::test to tendermint_config::test * Remove config/tests/config.rs * Minor fixes * Resolve conflict in #986 (#1004) * Fix `cargo test` and add check to CI (#990) * Relocate ABCI test to fix broken doctest Signed-off-by: Thane Thomson <connect@thanethomson.com> * Use tokio_test for mock client doctest Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add CI test for default features Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add `block_search` RPC endpoint (#991) * Add block_search RPC endpoint and tests * Add .changelog entry * Fix comments * tools: Fix `block_search` endpoint integration tests (#999) Closes #998 * Bump integration test tendermint to v0.34.13 * Fix kvstore integration tests * Bump tendermint version to v0.34.13 in CI Signed-off-by: Thane Thomson <connect@thanethomson.com> * ci: Build and check tools (#997) So far only the kvstore tests ran as part of the Github workfows. This would leave opportunity for changes to introduce breakage to the builds of the tools. In this change the same build and clippy stages are introduced for the tools workspace that currently run for the top-level one. Signed-off-by: xla <self@xla.is> * tools: Add `block_search` method to RPC probe (#1002) * Add missing block_search endpoint * Bump tendermint version to v0.34.13 Signed-off-by: Thane Thomson <connect@thanethomson.com> Co-authored-by: Shoaib Ahmed <sufialhussaini@gmail.com> Co-authored-by: xla <a.simmerl@gmail.com> * Fix abci-test * Add changelog entry Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add more changelog entries for other breaking changes Signed-off-by: Thane Thomson <connect@thanethomson.com> * Add tendermint-config to release script Signed-off-by: Thane Thomson <connect@thanethomson.com> * Fix merge mistakes Co-authored-by: Thane Thomson <thane@informal.systems> Co-authored-by: Shoaib Ahmed <sufialhussaini@gmail.com> Co-authored-by: xla <a.simmerl@gmail.com> Co-authored-by: Thane Thomson <connect@thanethomson.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges all latest changes from
masterand resolves the conflict inabci/src/lib.rs..changelog/