Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Populate memo in blockstore signatures-for-address (backport #19515) #19605

Merged
merged 2 commits into from
Sep 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2021

This is an automatic backport of pull request #19515 done by Mergify.
Cherry-pick of 5fa3e57 has failed:

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

You are currently cherry-picking commit 5fa3e5744.
  (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_db.rs
	modified:   rpc/src/transaction_status_service.rs
	modified:   transaction-status/src/extract_memos.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.io/

* Add TransactionMemos column family

* Traitify extract_memos

* Write TransactionMemos in TransactionStatusService

* Populate memos from column

* Dedupe and add unit test

(cherry picked from commit 5fa3e57)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Sep 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 3, 2021

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 Sep 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 3, 2021

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-19515 branch from fd2518f to 2b08b0c Compare September 3, 2021 06:46
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 3, 2021
@codecov
Copy link

codecov bot commented Sep 3, 2021

Codecov Report

Merging #19605 (5fa3e57) into v1.7 (aa2098d) will increase coverage by 0.2%.
The diff coverage is 69.1%.

❗ Current head 5fa3e57 differs from pull request most recent head 2b08b0c. Consider uploading reports for the commit 2b08b0c to get more accurate results

@@            Coverage Diff            @@
##             v1.7   #19605     +/-   ##
=========================================
+ Coverage    82.2%    82.5%   +0.2%     
=========================================
  Files         437      468     +31     
  Lines      123862   131679   +7817     
=========================================
+ Hits       101893   108688   +6795     
- Misses      21969    22991   +1022     

@mergify mergify bot merged commit 105a891 into v1.7 Sep 3, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-19515 branch September 3, 2021 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant