temp

aptos-labs · Dec 11, 2024 · e2b02e2 · e2b02e2
1 parent 40ab844
commit e2b02e2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
@@ -884,11 +884,15 @@ impl Execution {
         let mut features = Features::fetch_config(&state).unwrap_or_default();
         features.enable(FeatureFlag::VM_BINARY_FORMAT_V7);
         features.enable(FeatureFlag::NATIVE_MEMORY_OPERATIONS);
+        // module_event_migration_enabled
         // features.enable(FeatureFlag::ENABLE_LOADER_V2);
         if v2_flag {
             features.enable(FeatureFlag::FAKE_FEATURE_FOR_COMPARISON_TESTING);
         }
         state.set_features(features);
+        let features = Features::fetch_config(&state).unwrap();
+        println!("v2 flag:{}, enabled:{}", v2_flag, features.is_enabled(FeatureFlag::COIN_TO_FUNGIBLE_ASSET_MIGRATION));
+        println!("v2 flag:{}, enabled:{}", v2_flag, features.is_enabled(FeatureFlag::MODULE_EVENT_MIGRATION));
 
         // We use executor only to get access to block executor and avoid some of
         // the initializations, but ignore its internal state, i.e., FakeDataStore.

diff --git a/aptos-move/aptos-e2e-comparison-testing/src/main.rs b/aptos-move/aptos-e2e-comparison-testing/src/main.rs
@@ -188,7 +188,7 @@ async fn main() -> Result<()> {
             } else {
                 PathBuf::from(".")
             };
-            prepare_aptos_packages(input.join(APTOS_COMMONS)).await;
+            // prepare_aptos_packages(input.join(APTOS_COMMONS)).await;
             let executor =
                 Execution::new(input, execution_mode.unwrap_or_default(), skip_ref_packages);
             executor

diff --git a/third_party/move/move-compiler-v2/src/experiments.rs b/third_party/move/move-compiler-v2/src/experiments.rs
@@ -161,7 +161,7 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
         Experiment {
             name: Experiment::OPTIMIZE_WAITING_FOR_COMPARE_TESTS.to_string(),
             description: "Turns on optimizations waiting for comparison testing".to_string(),
-            default: Given(true),
+            default: Given(false),
         },
         Experiment {
             name: Experiment::CFG_SIMPLIFICATION.to_string(),
@@ -274,15 +274,15 @@ pub static EXPERIMENTS: Lazy<BTreeMap<String, Experiment>> = Lazy::new(|| {
         Experiment {
             name: Experiment::AVOID_STORE_IN_ASSIGNS.to_string(),
             description: "Avoid storing to a local during assigns".to_string(),
-            default: Inherited(Experiment::OPTIMIZE_WAITING_FOR_COMPARE_TESTS.to_string()),
+            default: Given(true),
         },
         Experiment {
             name: Experiment::RETAIN_TEMPS_FOR_ARGS.to_string(),
             description:
                 "Create temps for each argument of a function call during stackless bytecode \
                  generation and retain them until file format bytecode generation"
                     .to_string(),
-            default: Inherited(Experiment::OPTIMIZE_WAITING_FOR_COMPARE_TESTS.to_string()),
+            default: Given(true),
         },
     ];
     experiments

diff --git a/types/src/on_chain_config/aptos_features.rs b/types/src/on_chain_config/aptos_features.rs
@@ -100,7 +100,7 @@ pub enum FeatureFlag {
     /// AIP-105 (https://github.com/aptos-foundation/AIPs/blob/main/aips/aip-105.md)
     NATIVE_MEMORY_OPERATIONS = 80,
     ENABLE_LOADER_V2 = 81,
-    FAKE_FEATURE_FOR_COMPARISON_TESTING = 1000,
+    FAKE_FEATURE_FOR_COMPARISON_TESTING = 82,
 }
 
 impl FeatureFlag {