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

v1.14: loaded accounts data size cost does not apply to vote transaction (backport of #33235) #33260

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2023

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

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

You are currently cherry-picking commit dfaec7897a.
  (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:   runtime/src/cost_tracker.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   cost-model/src/transaction_cost.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

…3235)

* loaded accounts data size cost does not apply to vote transaction

* add a test for vote cost

(cherry picked from commit dfaec78)

# Conflicts:
#	cost-model/src/transaction_cost.rs
@codecov
Copy link

codecov bot commented Sep 15, 2023

Codecov Report

Merging #33260 (8083c0e) into v1.14 (aa73b94) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##            v1.14   #33260   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         665      665           
  Lines      185606   185606           
=======================================
+ Hits       152556   152561    +5     
+ Misses      33050    33045    -5     

@tao-stones
Copy link
Contributor

close it without merge, cause loaded_accounts_data_size logics were not backported to 1.14

@tao-stones tao-stones closed this Sep 15, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-33235 branch September 15, 2023 15:00
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