Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: shred: expose merkle root for use in blockstore (backport of #34063) #34291

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2023

This is an automatic backport of pull request #34063 done by Mergify.


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

@behzadnouri
Copy link
Contributor

Looks like need to backport MerkleRootMeta first.

@AshwinSekar
Copy link
Contributor

good catch, repopened #34028

Copy link

codecov bot commented Dec 1, 2023

Codecov Report

Merging #34291 (9e5b80f) into v1.17 (311e986) will decrease coverage by 0.1%.
The diff coverage is 7.4%.

Additional details and impacted files
@@            Coverage Diff            @@
##            v1.17   #34291     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         803      803             
  Lines      218110   218135     +25     
=========================================
- Hits       178570   178565      -5     
- Misses      39540    39570     +30     

@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-34063 branch from 9fbd65b to ac22b02 Compare December 1, 2023 04:28
@AshwinSekar AshwinSekar closed this Dec 6, 2023
@mergify mergify bot deleted the mergify/bp/v1.17/pr-34063 branch December 6, 2023 00:04
@AshwinSekar AshwinSekar restored the mergify/bp/v1.17/pr-34063 branch December 6, 2023 23:47
@AshwinSekar
Copy link
Contributor

necessary for the backport chain to #34270

@AshwinSekar AshwinSekar reopened this Dec 6, 2023
* shred: expose merkle root for use in blockstore

* pr feedback: sorted, keep Result return type

* convert Result<Hash> -> Option<Hash>

(cherry picked from commit 6a5b8e8)
@AshwinSekar AshwinSekar force-pushed the mergify/bp/v1.17/pr-34063 branch from ac22b02 to 9e5b80f Compare December 6, 2023 23:48
@AshwinSekar AshwinSekar merged commit 22f4694 into v1.17 Dec 7, 2023
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.17/pr-34063 branch December 7, 2023 14:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants