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

update ledger tool to restore cost table from blockstore (backport #18489) #18699

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2021

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

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

You are currently cherry-picking commit b6dff1292.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   core/src/cost_model.rs
	both modified:   core/src/validator.rs
	both modified:   ledger-tool/src/main.rs

no changes added to commit (use "git add" and/or "git commit -a")

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/

* update ledger tool to restore cost model from blockstore when compute-slot-cost

* Move initialize_cost_table into cost_model, so the function can be tested and shared between validator and ledger-tool

* refactor and simplify a test

(cherry picked from commit b6dff12)

# Conflicts:
#	core/src/cost_model.rs
#	core/src/validator.rs
#	ledger-tool/src/main.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 Jul 15, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 15, 2021

automerge label removed due to a CI failure

@tao-stones
Copy link
Contributor

pull from 1.7, aiming 1.8

@tao-stones tao-stones closed this Jul 15, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18489 branch July 15, 2021 16:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant