Skip to content

Commit

Permalink
deprecate stale fee collection implementation (#12800)
Browse files Browse the repository at this point in the history
Current implementation is stale, and cannot be used as defined. So better to remove it, and add it back later if needed.

Let me know if you have preference on whether to keep or remove stake related changes, as those might be more similar for future stake changes. Removed them in this PR, as adding them back should be as easy as this removal is.
  • Loading branch information
igor-aptos authored Oct 24, 2024
1 parent 1fa915c commit 63a91dc
Show file tree
Hide file tree
Showing 53 changed files with 466 additions and 2,773 deletions.
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

0 comments on commit 63a91dc

Please sign in to comment.