Delete tests that verify legacy behavior (i.e. before private neurons).

dfinity · Jan 30, 2025 · f058116 · f058116
1 parent 2a53ea7
commit f058116
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 344 deletions.
diff --git a/rs/nns/governance/src/neuron/types/tests.rs b/rs/nns/governance/src/neuron/types/tests.rs
@@ -5,8 +5,7 @@ use crate::{
         manage_neuron::{SetDissolveTimestamp, StartDissolving},
         VotingPowerEconomics,
     },
-    temporarily_disable_private_neuron_enforcement, temporarily_disable_voting_power_adjustment,
-    temporarily_enable_private_neuron_enforcement, temporarily_enable_voting_power_adjustment,
+    temporarily_disable_voting_power_adjustment, temporarily_enable_voting_power_adjustment,
 };
 use ic_cdk::println;
 
@@ -437,63 +436,51 @@ fn test_visibility_when_converting_neuron_to_neuron_info_and_neuron_proto() {
     );
 
     // Case 1: visibility is explicitly set.
-    for set_enforcement in [
-        temporarily_enable_private_neuron_enforcement,
-        temporarily_disable_private_neuron_enforcement,
-    ] {
-        let _restore_on_drop = set_enforcement();
-
-        for visibility in [Visibility::Public, Visibility::Private] {
-            let neuron = builder.clone().with_visibility(Some(visibility)).build();
+    for visibility in [Visibility::Public, Visibility::Private] {
+        let neuron = builder.clone().with_visibility(Some(visibility)).build();
 
-            assert_eq!(neuron.visibility(), Some(visibility),);
+        assert_eq!(neuron.visibility(), Some(visibility),);
 
-            let neuron_info = neuron.get_neuron_info(
-                &VotingPowerEconomics::DEFAULT,
-                timestamp_seconds,
-                principal_id,
-            );
-            assert_eq!(neuron_info.visibility, Some(visibility as i32),);
+        let neuron_info = neuron.get_neuron_info(
+            &VotingPowerEconomics::DEFAULT,
+            timestamp_seconds,
+            principal_id,
+        );
+        assert_eq!(neuron_info.visibility, Some(visibility as i32),);
 
-            let neuron_proto = neuron.into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
-            assert_eq!(neuron_proto.visibility, Some(visibility as i32),);
-        }
+        let neuron_proto = neuron.into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
+        assert_eq!(neuron_proto.visibility, Some(visibility as i32),);
     }
 
     // Case 2: visibility is not set.
+
     let neuron = builder.clone().build();
-    {
-        let _restore_on_drop = temporarily_disable_private_neuron_enforcement();
 
-        assert_eq!(neuron.visibility(), None,);
+    assert_eq!(neuron.visibility(), None,);
 
-        let neuron_info = neuron.get_neuron_info(
-            &VotingPowerEconomics::DEFAULT,
-            timestamp_seconds,
-            principal_id,
-        );
-        assert_eq!(neuron_info.visibility, None,);
+    let neuron_info = neuron.get_neuron_info(
+        &VotingPowerEconomics::DEFAULT,
+        timestamp_seconds,
+        principal_id,
+    );
+    assert_eq!(neuron_info.visibility, None,);
 
-        let neuron_proto = neuron
-            .clone()
-            .into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
-        assert_eq!(neuron_proto.visibility, None,);
-    }
-    {
-        let _restore_on_drop = temporarily_enable_private_neuron_enforcement();
+    let neuron_proto = neuron
+        .clone()
+        .into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
+    assert_eq!(neuron_proto.visibility, None,);
 
-        assert_eq!(neuron.visibility(), Some(Visibility::Private),);
+    assert_eq!(neuron.visibility(), Some(Visibility::Private),);
 
-        let neuron_info = neuron.get_neuron_info(
-            &VotingPowerEconomics::DEFAULT,
-            timestamp_seconds,
-            principal_id,
-        );
-        assert_eq!(neuron_info.visibility, Some(Visibility::Private as i32),);
+    let neuron_info = neuron.get_neuron_info(
+        &VotingPowerEconomics::DEFAULT,
+        timestamp_seconds,
+        principal_id,
+    );
+    assert_eq!(neuron_info.visibility, Some(Visibility::Private as i32),);
 
-        let neuron_proto = neuron.into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
-        assert_eq!(neuron_proto.visibility, Some(Visibility::Private as i32),);
-    }
+    let neuron_proto = neuron.into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
+    assert_eq!(neuron_proto.visibility, Some(Visibility::Private as i32),);
 
     // Case 3: Known neurons are always public.
     let neuron = builder
@@ -502,26 +489,20 @@ fn test_visibility_when_converting_neuron_to_neuron_info_and_neuron_proto() {
             description: Some("neuron description".to_string()),
         }))
         .build();
-    for set_enforcement in [
-        temporarily_enable_private_neuron_enforcement,
-        temporarily_disable_private_neuron_enforcement,
-    ] {
-        let _restore_on_drop = set_enforcement();
 
-        assert_eq!(neuron.visibility(), Some(Visibility::Public),);
+    assert_eq!(neuron.visibility(), Some(Visibility::Public),);
 
-        let neuron_info = neuron.get_neuron_info(
-            &VotingPowerEconomics::DEFAULT,
-            timestamp_seconds,
-            principal_id,
-        );
-        assert_eq!(neuron_info.visibility, Some(Visibility::Public as i32),);
+    let neuron_info = neuron.get_neuron_info(
+        &VotingPowerEconomics::DEFAULT,
+        timestamp_seconds,
+        principal_id,
+    );
+    assert_eq!(neuron_info.visibility, Some(Visibility::Public as i32),);
 
-        let neuron_proto = neuron
-            .clone()
-            .into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
-        assert_eq!(neuron_proto.visibility, Some(Visibility::Public as i32),);
-    }
+    let neuron_proto = neuron
+        .clone()
+        .into_proto(&VotingPowerEconomics::DEFAULT, timestamp_seconds);
+    assert_eq!(neuron_proto.visibility, Some(Visibility::Public as i32),);
 }
 
 #[test]