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

Fix various ledger-tool error due to no builtins (bp #12759)#12766

Merged
mergify[bot] merged 2 commits intov1.4from
mergify/bp/v1.4/pr-12759
Oct 10, 2020
Merged

Fix various ledger-tool error due to no builtins (bp #12759)#12766
mergify[bot] merged 2 commits intov1.4from
mergify/bp/v1.4/pr-12759

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 9, 2020

This is an automated backport of pull request #12759 done by Mergify

Cherry-pick of 1f4bcf7 has failed:

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

You are currently cherry-picking commit 1f4bcf70b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Cargo.lock
	modified:   core/src/lib.rs
	modified:   core/src/validator.rs
	modified:   ledger/src/bank_forks_utils.rs
	modified:   ledger/src/blockstore_processor.rs
	renamed:    core/src/builtins.rs -> ledger/src/builtins.rs
	modified:   ledger/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   core/Cargo.toml
	both modified:   ledger/Cargo.toml

To fixup this pull request, you can check out it 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/

* Fix various ledger-tool error due to no builtins

* Add missing file...

(cherry picked from commit 1f4bcf7)

# Conflicts:
#	core/Cargo.toml
#	ledger/Cargo.toml
@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 Oct 9, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 9, 2020

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 10, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 10, 2020

Codecov Report

Merging #12766 into v1.4 will decrease coverage by 0.0%.
The diff coverage is 50.0%.

@@           Coverage Diff            @@
##            v1.4   #12766     +/-   ##
========================================
- Coverage   81.9%    81.9%   -0.1%     
========================================
  Files        353      359      +6     
  Lines      84303    84355     +52     
========================================
+ Hits       69068    69102     +34     
- Misses     15235    15253     +18     

@mergify mergify Bot merged commit 6b9b107 into v1.4 Oct 10, 2020
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-12759 branch October 10, 2020 07:10
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.

2 participants