Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deprecate stale fee collection implementation #12800

Merged
merged 3 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ impl From<FeatureFlag> for AptosFeatureFlag {
match f {
FeatureFlag::CodeDependencyCheck => AptosFeatureFlag::CODE_DEPENDENCY_CHECK,
FeatureFlag::CollectAndDistributeGasFees => {
AptosFeatureFlag::COLLECT_AND_DISTRIBUTE_GAS_FEES
AptosFeatureFlag::_DEPRECATED_COLLECT_AND_DISTRIBUTE_GAS_FEES
},
FeatureFlag::TreatFriendAsPrivate => AptosFeatureFlag::TREAT_FRIEND_AS_PRIVATE,
FeatureFlag::Sha512AndRipeMd160Natives => {
Expand Down Expand Up @@ -356,7 +356,7 @@ impl From<AptosFeatureFlag> for FeatureFlag {
fn from(f: AptosFeatureFlag) -> Self {
match f {
AptosFeatureFlag::CODE_DEPENDENCY_CHECK => FeatureFlag::CodeDependencyCheck,
AptosFeatureFlag::COLLECT_AND_DISTRIBUTE_GAS_FEES => {
AptosFeatureFlag::_DEPRECATED_COLLECT_AND_DISTRIBUTE_GAS_FEES => {
FeatureFlag::CollectAndDistributeGasFees
},
AptosFeatureFlag::TREAT_FRIEND_AS_PRIVATE => FeatureFlag::TreatFriendAsPrivate,
Expand Down
1 change: 0 additions & 1 deletion aptos-move/e2e-move-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pub mod aptos_governance;
pub mod harness;
pub mod resource_groups;
pub mod stake;
pub mod transaction_fee;

use anyhow::bail;
use aptos_framework::{BuildOptions, BuiltPackage, UPGRADE_POLICY_CUSTOM_FIELD};
Expand Down
1 change: 0 additions & 1 deletion aptos-move/e2e-move-tests/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ mod test_self;
mod token_event_store;
mod token_objects;
mod transaction_context;
mod transaction_fee;
mod type_too_large;
mod vector_numeric_address;
mod vm;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading