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

adds back ErasureMeta::first_coding_index field (backport #21623)#22912

Merged
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21623
Feb 3, 2022
Merged

adds back ErasureMeta::first_coding_index field (backport #21623)#22912
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21623

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 3, 2022

This is an automatic backport of pull request #21623 done by Mergify.
Cherry-pick of 49ba09b has failed:

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

You are currently cherry-picking commit 49ba09b33.
  (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:   ledger/src/blockstore_meta.rs
	modified:   ledger/src/erasure.rs
	modified:   ledger/src/shred.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.rs

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

#16646
removed first_coding_index since the field is currently redundant and
always equal to fec_set_index.
However, with upcoming changes to erasure coding schema, this will no
longer be the same as fec_set_index and so requires a separate field to
represent.

(cherry picked from commit 49ba09b)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 3, 2022

Codecov Report

Merging #22912 (858c14d) into v1.8 (add26be) will increase coverage by 0.0%.
The diff coverage is 92.4%.

@@           Coverage Diff           @@
##             v1.8   #22912   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         464      464           
  Lines      131709   131738   +29     
=======================================
+ Hits       107555   107598   +43     
+ Misses      24154    24140   -14     

@mergify mergify Bot merged commit 6e46511 into v1.8 Feb 3, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21623 branch February 3, 2022 17:59
@github-actions
Copy link
Copy Markdown
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant