merge-queue: embarking main (035fad5) and [#5733 + #5716] together #5746
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
updates TransactionContextualValidity request to check sprout anchors adds comment mentioning TransactionContextualValidity ignores UTXOs
updates tests
Co-authored-by: teor <teor@riseup.net>
moves if let statement into for loop
renames transaction_in_state to transaction_in_chain
deletes broken test
Co-authored-by: teor <teor@riseup.net>
rustfmt
updates comments and naming
slightly improves formatting
Co-authored-by: teor <teor@riseup.net>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #5746 +/- ##
==========================================
+ Coverage 78.77% 78.85% +0.07%
==========================================
Files 306 306
Lines 38552 38676 +124
==========================================
+ Hits 30370 30497 +127
+ Misses 8182 8179 -3 |
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.
🎉 This combination of pull requests has been checked successfully 🎉
Branch main (035fad5) and [#5733 + #5716] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#5733 + #5716].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
batchedfor merge:#approved-reviews-by>=1[🛡 GitHub branch protection]#changes-requested-reviews-by=0[🛡 GitHub branch protection]#review-threads-unresolved=0[🛡 GitHub branch protection]base=maincheck-success=Rustfmtcheck-neutral=Rustfmtcheck-skipped=Rustfmtcheck-success=mergefreezecheck-neutral=mergefreezecheck-skipped=mergefreezecheck-success=Test integration with lightwalletdcheck-neutral=Test integration with lightwalletdcheck-skipped=Test integration with lightwalletdcheck-success=Clippycheck-neutral=Clippycheck-skipped=Clippycheck-success=Test with fake activation heightscheck-neutral=Test with fake activation heightscheck-skipped=Test with fake activation heightscheck-success=Test allcheck-neutral=Test allcheck-skipped=Test allcheck-success=Check deny.toml banscheck-neutral=Check deny.toml banscheck-skipped=Check deny.toml banscheck-success=Check deny.toml bans --all-featurescheck-neutral=Check deny.toml bans --all-featurescheck-skipped=Check deny.toml bans --all-featurescheck-success=Check deny.toml bans --no-default-featurescheck-neutral=Check deny.toml bans --no-default-featurescheck-skipped=Check deny.toml bans --no-default-featurescheck-success=Check deny.toml sourcescheck-neutral=Check deny.toml sourcescheck-skipped=Check deny.toml sourcescheck-success=Check deny.toml sources --all-featurescheck-neutral=Check deny.toml sources --all-featurescheck-skipped=Check deny.toml sources --all-featurescheck-success=Check deny.toml sources --no-default-featurescheck-neutral=Check deny.toml sources --no-default-featurescheck-skipped=Check deny.toml sources --no-default-featurescheck-success=Check Cargo.lock is up to datecheck-neutral=Check Cargo.lock is up to datecheck-skipped=Check Cargo.lock is up to datecheck-success=Find available cached state diskscheck-neutral=Find available cached state diskscheck-skipped=Find available cached state diskscheck-success=Install zebrad from lockfile without cache on ubuntu-latestcheck-neutral=Install zebrad from lockfile without cache on ubuntu-latestcheck-skipped=Install zebrad from lockfile without cache on ubuntu-latestcheck-success=Test checkpoint sync from empty statecheck-neutral=Test checkpoint sync from empty statecheck-skipped=Test checkpoint sync from empty statecheck-success=Zebra checkpoint update / Run sync-past-checkpoint testcheck-neutral=Zebra checkpoint update / Run sync-past-checkpoint testcheck-skipped=Zebra checkpoint update / Run sync-past-checkpoint testcheck-success=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-success=Zebra checkpoint / Run sync-to-checkpoint testcheck-neutral=Zebra checkpoint / Run sync-to-checkpoint testcheck-skipped=Zebra checkpoint / Run sync-to-checkpoint testcheck-success=Coverage on stablecheck-neutral=Coverage on stablecheck-skipped=Coverage on stablecheck-success=Rust doccheck-neutral=Rust doccheck-skipped=Rust doccheck-success=Build tower-batch cratecheck-neutral=Build tower-batch cratecheck-skipped=Build tower-batch cratecheck-success=Build tower-fallback cratecheck-neutral=Build tower-fallback cratecheck-skipped=Build tower-fallback cratecheck-success=Build zebra-chain cratecheck-neutral=Build zebra-chain cratecheck-skipped=Build zebra-chain cratecheck-success=Build zebra-client cratecheck-neutral=Build zebra-client cratecheck-skipped=Build zebra-client cratecheck-success=Build zebra-consensus cratecheck-neutral=Build zebra-consensus cratecheck-skipped=Build zebra-consensus cratecheck-success=Build zebra-network cratecheck-neutral=Build zebra-network cratecheck-skipped=Build zebra-network cratecheck-success=Build zebra-node-services cratecheck-neutral=Build zebra-node-services cratecheck-skipped=Build zebra-node-services cratecheck-success=Build zebra-rpc cratecheck-neutral=Build zebra-rpc cratecheck-skipped=Build zebra-rpc cratecheck-success=Build zebra-script cratecheck-neutral=Build zebra-script cratecheck-skipped=Build zebra-script cratecheck-success=Build zebra-state cratecheck-neutral=Build zebra-state cratecheck-skipped=Build zebra-state cratecheck-success=Build zebra-test cratecheck-neutral=Build zebra-test cratecheck-skipped=Build zebra-test cratecheck-success=Build zebra-utils cratecheck-neutral=Build zebra-utils cratecheck-skipped=Build zebra-utils cratecheck-success=Build zebrad cratecheck-neutral=Build zebrad cratecheck-skipped=Build zebrad cratecheck-success=check-matrixcheck-neutral=check-matrixcheck-skipped=check-matrixcheck-success=Zebra tip / Run full-sync-to-tip testcheck-neutral=Zebra tip / Run full-sync-to-tip testcheck-skipped=Zebra tip / Run full-sync-to-tip testcheck-success=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-success=lightwalletd tip send / Run lwd-send-transactions testcheck-neutral=lightwalletd tip send / Run lwd-send-transactions testcheck-skipped=lightwalletd tip send / Run lwd-send-transactions testcheck-success=lightwalletd tip update / Run lwd-update-sync testcheck-neutral=lightwalletd tip update / Run lwd-update-sync testcheck-skipped=lightwalletd tip update / Run lwd-update-sync testcheck-success=Zebra tip update / Run update-to-tip testcheck-neutral=Zebra tip update / Run update-to-tip testcheck-skipped=Zebra tip update / Run update-to-tip testcheck-success=lightwalletd tip / Run lwd-full-sync testcheck-neutral=lightwalletd tip / Run lwd-full-sync testcheck-skipped=lightwalletd tip / Run lwd-full-sync testcheck-success=Test all with getblocktemplate-rpcs featurecheck-neutral=Test all with getblocktemplate-rpcs featurecheck-skipped=Test all with getblocktemplate-rpcs featurecheck-success=Test beta on ubuntu-latestcheck-neutral=Test beta on ubuntu-latestcheck-skipped=Test beta on ubuntu-latestcheck-success=Test stable on macos-latestcheck-neutral=Test stable on macos-latestcheck-skipped=Test stable on macos-latestcheck-success=Test stable on ubuntu-latestcheck-neutral=Test stable on ubuntu-latestcheck-skipped=Test stable on ubuntu-latestcheck-success=Build CI Docker / Build imagescheck-neutral=Build CI Docker / Build imagescheck-skipped=Build CI Docker / Build imagescheck-success=Build lightwalletd Dockercheck-neutral=Build lightwalletd Dockercheck-skipped=Build lightwalletd Dockercheck-success=Test beta on ubuntu-latest --features getblocktemplate-rpcscheck-neutral=Test beta on ubuntu-latest --features getblocktemplate-rpcscheck-skipped=Test beta on ubuntu-latest --features getblocktemplate-rpcscheck-success=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-neutral=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-skipped=Test stable on ubuntu-latest --features getblocktemplate-rpcscheck-success=submit block / Run submit-block testcheck-neutral=submit block / Run submit-block testcheck-skipped=submit block / Run submit-block testMore informations about Mergify merge queue can be found in the documentation.
Mergify commands
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the queue rulesAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com