Allow disabling accumulator

Author: lxfind

crates/sui-core/src/authority/shared_object_version_manager.rs

@@ -1014,7 +1014,7 @@ mod tests {
             // Create a shared object for testing
             let shared_objects = vec![Object::shared_for_testing()];
             let mut config = ProtocolConfig::get_for_max_version_UNSAFE();
-            config.enable_accumulators_for_testing();
+            config.set_enable_accumulators_for_testing(true);
             let authority = TestAuthorityBuilder::new()
                 .with_starting_objects(&shared_objects)
                 .with_protocol_config(config)

crates/sui-core/src/execution_scheduler/balance_withdraw_scheduler/e2e_tests.rs

@@ -62,7 +62,7 @@ async fn create_test_env(init_balances: BTreeMap<TypeTag, u64>) -> TestEnv {
     let account_objects = starting_objects.iter().map(|o| o.id()).collect();
     starting_objects.push(gas_object.clone());
     let mut protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
-    protocol_config.enable_accumulators_for_testing();
+    protocol_config.set_enable_accumulators_for_testing(true);
     let state = TestAuthorityBuilder::new()
         .with_protocol_config(protocol_config)
         .with_starting_objects(&starting_objects)

crates/sui-core/src/unit_tests/coin_deny_list_tests.rs

@@ -418,7 +418,7 @@ async fn new_authority_and_publish(path: &str) -> TestEnv {
 
     let mut protocol_config =
         ProtocolConfig::get_for_version(ProtocolVersion::max(), Chain::Unknown);
-    protocol_config.enable_accumulators_for_testing();
+    protocol_config.set_enable_accumulators_for_testing(true);
     protocol_config
         .set_per_object_congestion_control_mode_for_testing(PerObjectCongestionControlMode::None);
 

crates/sui-e2e-tests/tests/address_balance_tests.rs

@@ -105,7 +105,7 @@ async fn test_accumulators_root_created() {
             cfg.set_buffer_stake_for_protocol_upgrade_bps_for_testing(0);
         }
         if version == ProtocolVersion::MAX_ALLOWED {
-            cfg.enable_accumulators_for_testing();
+            cfg.set_enable_accumulators_for_testing(true);
         }
         cfg
     });
@@ -176,7 +176,7 @@ async fn test_accumulators_disabled() {
             cfg.set_buffer_stake_for_protocol_upgrade_bps_for_testing(0);
         }
         if version == ProtocolVersion::MAX_ALLOWED {
-            cfg.enable_accumulators_for_testing();
+            cfg.set_enable_accumulators_for_testing(true);
         }
         cfg
     });
@@ -293,7 +293,7 @@ async fn test_accumulators_disabled() {
 async fn test_deposits() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -347,7 +347,7 @@ async fn test_deposits() {
 #[sim_test]
 async fn test_multiple_settlement_txns() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg.set_max_updates_per_settlement_txn_for_testing(3);
         cfg
     });
@@ -463,7 +463,7 @@ fn verify_accumulator_exists(
 async fn test_deposit_and_withdraw() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -510,7 +510,7 @@ async fn test_deposit_and_withdraw() {
 async fn test_deposit_and_withdraw_with_larger_reservation() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -543,7 +543,7 @@ async fn test_deposit_and_withdraw_with_larger_reservation() {
 async fn test_withdraw_non_existent_balance() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -572,7 +572,7 @@ async fn test_withdraw_non_existent_balance() {
 async fn test_withdraw_insufficient_balance() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 

crates/sui-protocol-config/src/lib.rs

@@ -4206,7 +4206,7 @@ impl ProtocolConfig {
                 95 => {
                     cfg.type_name_id_base_cost = Some(52);
 
-                    // Reudce the frequency of checkpoint splitting under high TPS.
+                    // Reduce the frequency of checkpoint splitting under high TPS.
                     cfg.max_transactions_per_checkpoint = Some(20_000);
                 }
                 96 => {
@@ -4581,8 +4581,8 @@ impl ProtocolConfig {
             .prepend_prologue_tx_in_consensus_commit_in_checkpoints = val;
     }
 
-    pub fn enable_accumulators_for_testing(&mut self) {
-        self.feature_flags.enable_accumulators = true;
+    pub fn set_enable_accumulators_for_testing(&mut self, val: bool) {
+        self.feature_flags.enable_accumulators = val;
     }
 
     pub fn create_root_accumulator_object_for_testing(&mut self) {
@@ -4596,7 +4596,7 @@ impl ProtocolConfig {
     }
 
     pub fn enable_authenticated_event_streams_for_testing(&mut self) {
-        self.enable_accumulators_for_testing();
+        self.set_enable_accumulators_for_testing(true);
         self.feature_flags.enable_authenticated_event_streams = true;
         self.feature_flags
             .include_checkpoint_artifacts_digest_in_summary = true;

crates/sui-transactional-test-runner/src/simulator_persisted_store.rs

@@ -135,7 +135,7 @@ impl PersistedStore {
                 move |_, cfg| {
                     let mut c = cfg;
                     if enable_accumulators {
-                        c.enable_accumulators_for_testing();
+                        c.set_enable_accumulators_for_testing(true);
                     }
                     if enable_authenticated_event_streams {
                         c.enable_authenticated_event_streams_for_testing();

crates/sui-transactional-test-runner/src/test_adapter.rs

@@ -269,7 +269,7 @@ impl AdapterInitConfig {
             ProtocolConfig::get_for_max_version_UNSAFE()
         };
         if enable_accumulators {
-            protocol_config.enable_accumulators_for_testing();
+            protocol_config.set_enable_accumulators_for_testing(true);
         }
         if enable_authenticated_event_streams {
             protocol_config.enable_authenticated_event_streams_for_testing();

crates/sui-types/src/unit_tests/address_balance_gas_tests.rs

@@ -66,7 +66,7 @@ fn test_address_balance_payment_requires_accumulators_enabled() {
 #[test]
 fn test_address_balance_payment_requires_feature_flag() {
     let mut config = ProtocolConfig::get_for_max_version_UNSAFE();
-    config.enable_accumulators_for_testing();
+    config.set_enable_accumulators_for_testing(true);
 
     let tx_data = create_test_transaction_data(
         vec![],

crates/sui-types/src/unit_tests/balance_withdraw_tests.rs

@@ -16,7 +16,7 @@ use crate::{
 
 fn protocol_config() -> ProtocolConfig {
     let mut cfg = ProtocolConfig::get_for_max_version_UNSAFE();
-    cfg.enable_accumulators_for_testing();
+    cfg.set_enable_accumulators_for_testing(true);
     cfg
 }