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

type AccountSecondaryIndexes = HashSet (backport #17108) #17149

Merged
merged 2 commits into from
May 10, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2021

This is an automatic backport of pull request #17108 done by Mergify.
Cherry-pick of f39dda0 has failed:

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

You are currently cherry-picking commit f39dda00e.
  (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:   accounts-bench/src/main.rs
	modified:   core/src/validator.rs
	modified:   core/tests/snapshots.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   runtime/benches/accounts_index.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/serde_snapshot.rs
	modified:   runtime/src/serde_snapshot/tests.rs
	modified:   runtime/src/snapshot_utils.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/benches/accounts.rs
	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/accounts_db.rs
	both modified:   runtime/src/accounts_index.rs

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

(cherry picked from commit f39dda0)

# Conflicts:
#	runtime/benches/accounts.rs
#	runtime/src/accounts.rs
#	runtime/src/accounts_db.rs
#	runtime/src/accounts_index.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 May 10, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 10, 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 May 10, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2021

automerge label removed due to a CI failure

@jeffwashington jeffwashington force-pushed the mergify/bp/v1.6/pr-17108 branch from 1144276 to 3b6d403 Compare May 10, 2021 19:30
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 10, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label May 10, 2021
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.6/pr-17108 branch from 3b6d403 to 894fbed Compare May 10, 2021 19:32
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 10, 2021
@jeffwashington jeffwashington requested a review from sakridge May 10, 2021 19:34
@jeffwashington
Copy link
Contributor

This is a straightforward refactoring required by #17110. We think #17110 will likely need to go into 1.6

@codecov
Copy link

codecov bot commented May 10, 2021

Codecov Report

Merging #17149 (894fbed) into v1.6 (094271b) will increase coverage by 0.0%.
The diff coverage is 96.0%.

@@           Coverage Diff           @@
##             v1.6   #17149   +/-   ##
=======================================
  Coverage    82.7%    82.7%           
=======================================
  Files         418      418           
  Lines      115713   115766   +53     
=======================================
+ Hits        95717    95803   +86     
+ Misses      19996    19963   -33     

@mergify mergify bot merged commit 733ef4b into v1.6 May 10, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17108 branch May 10, 2021 20:55
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant