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

cleanup feature code after activated everywhere #34509

Merged
merged 1 commit into from
Dec 19, 2023

Conversation

tao-stones
Copy link
Contributor

Problem

Feature A8xyMHZovGXFkorFqEmVH2PKGLiBip5JD7jt4zsUWo4H Remove congestion multiplier from transaction fee calculation #29881 has been activated everywhere.

Summary of Changes

  • clean up feature code

Fixes #

@tao-stones tao-stones force-pushed the cleanup-feature-29881 branch from a624e80 to 739a290 Compare December 18, 2023 18:11
Copy link

codecov bot commented Dec 18, 2023

Codecov Report

Merging #34509 (739a290) into master (1ac017c) will decrease coverage by 0.1%.
Report is 1 commits behind head on master.
The diff coverage is 100.0%.

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #34509     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         820      820             
  Lines      220869   220857     -12     
=========================================
- Hits       180788   180761     -27     
- Misses      40081    40096     +15     

@tao-stones tao-stones requested review from LucasSte, pgarg66 and steviez and removed request for LucasSte December 18, 2023 19:54
@@ -82,18 +82,13 @@ impl FeeStructure {
message: &SanitizedMessage,
lamports_per_signature: u64,
budget_limits: &FeeBudgetLimits,
remove_congestion_multiplier: bool,
include_loaded_account_data_size_in_fee: bool,
) -> u64 {
// Fee based on compute units and signatures
let congestion_multiplier = if lamports_per_signature == 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which tests are affected by this remaining branch? Seems unecessary to have this branch with the concept of congestion multiplier removed.

Copy link
Contributor

@apfitzge apfitzge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm - the mixed ordering of remove_congestion_multiplier and include_loaded_account_data_size_in_fee in calculate_fee and calculate_test_fee made this confusing to review!

@tao-stones tao-stones requested a review from apfitzge December 19, 2023 19:58
@tao-stones
Copy link
Contributor Author

lgtm - the mixed ordering of remove_congestion_multiplier and include_loaded_account_data_size_in_fee in calculate_fee and calculate_test_fee made this confusing to review!

good news is it's better now :D

@tao-stones tao-stones merged commit 4a8582e into solana-labs:master Dec 19, 2023
28 checks passed
@tao-stones tao-stones deleted the cleanup-feature-29881 branch December 19, 2023 19:59
@steviez
Copy link
Contributor

steviez commented Dec 19, 2023

Was a tad late to the review, but looks good to me; sounds like Tao will address my last comment in a further comment:

$ solana feature status | grep A8xyMHZovGXFkorFqEmVH2PKGLiBip5JD7jt4zsUWo4H
A8xyMHZovGXFkorFqEmVH2PKGLiBip5JD7jt4zsUWo4H | active since epoch 548  | 236736000       | Remove congestion multiplier from transaction fee calculation #29881

@tao-stones
Copy link
Contributor Author

Was a tad late to the review, but looks good to me; sounds like Tao will address my last comment in a further comment:

$ solana feature status | grep A8xyMHZovGXFkorFqEmVH2PKGLiBip5JD7jt4zsUWo4H
A8xyMHZovGXFkorFqEmVH2PKGLiBip5JD7jt4zsUWo4H | active since epoch 548  | 236736000       | Remove congestion multiplier from transaction fee calculation #29881

#34537 is the follow up PR to remove unnecessary parameter, leads to a great simplification of code

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants