WIP

dfinity · Mar 3, 2025 · 9e98a3b · 9e98a3b
1 parent 58db016
commit 9e98a3b
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 86 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -185,7 +185,6 @@ members = [
     "rs/nervous_system/common/test_canister",
     "rs/nervous_system/common/test_keys",
     "rs/nervous_system/common/test_utils",
-    "rs/nervous_system/common/time_helpers",
     "rs/nervous_system/common/validation",
     "rs/nervous_system/histogram",
     "rs/nervous_system/humanize",

diff --git a/rs/nervous_system/common/time_helpers/BUILD.bazel b/rs/nervous_system/common/time_helpers/BUILD.bazel
diff --git a/rs/nervous_system/common/time_helpers/Cargo.toml b/rs/nervous_system/common/time_helpers/Cargo.toml
diff --git a/rs/nervous_system/common/time_helpers/src/lib.rs b/rs/nervous_system/common/time_helpers/src/lib.rs
diff --git a/rs/nervous_system/timers/src/test.rs b/rs/nervous_system/timers/src/test.rs
@@ -1,4 +1,4 @@
-pub use ic_cdk_timers::TimerId;
+use ic_cdk_timers::TimerId;
 use slotmap::SlotMap;
 use std::cell::RefCell;
 use std::collections::BTreeMap;

diff --git a/rs/nns/governance/BUILD.bazel b/rs/nns/governance/BUILD.bazel
@@ -48,7 +48,6 @@ DEPENDENCIES = [
     "//rs/nervous_system/canisters",
     "//rs/nervous_system/clients",
     "//rs/nervous_system/common",
-    "//rs/nervous_system/common/time_helpers",
     "//rs/nervous_system/governance",
     "//rs/nervous_system/linear_map",
     "//rs/nervous_system/long_message",

diff --git a/rs/nns/governance/Cargo.toml b/rs/nns/governance/Cargo.toml
@@ -48,7 +48,6 @@ ic-nervous-system-canisters = { path = "../../nervous_system/canisters" }
 ic-nervous-system-clients = { path = "../../nervous_system/clients" }
 ic-nervous-system-common = { path = "../../nervous_system/common" }
 ic-nervous-system-common-build-metadata = { path = "../../nervous_system/common/build_metadata" }
-ic-nervous-system-common-time-helpers = { path = "../../nervous_system/common/time_helpers" }
 ic-nervous-system-governance = { path = "../../nervous_system/governance" }
 ic-nervous-system-linear-map = { path = "../../nervous_system/linear_map" }
 ic-nervous-system-long-message = { path = "../../nervous_system/long_message" }

diff --git a/rs/nns/governance/src/canister_state.rs b/rs/nns/governance/src/canister_state.rs
@@ -114,11 +114,6 @@ pub fn set_governance_for_tests(gov: Governance) {
     GOVERNANCE.set(gov);
 }
 
-#[cfg(test)]
-pub fn set_governance_no_validation(gov: Governance) {
-    GOVERNANCE.set(gov);
-}
-
 #[derive(Default)]
 pub struct CanisterEnv {
     #[cfg(any(test, feature = "test"))]

diff --git a/rs/nns/governance/src/governance.rs b/rs/nns/governance/src/governance.rs
@@ -6869,6 +6869,8 @@ impl Governance {
         } else {
             let mut reward_distribution = RewardsDistribution::new();
             for (neuron_id, used_voting_rights) in voters_to_used_voting_right {
+                // TODO DO NOT MERGE - should we do this check here at all, or just defer
+                // to distribution
                 if self.neuron_store.contains(neuron_id) {
                     let reward = (used_voting_rights * total_available_e8s_equivalent_float
                         / total_voting_rights) as u64;

diff --git a/rs/nns/governance/src/governance/benches.rs b/rs/nns/governance/src/governance/benches.rs
@@ -1,3 +1,4 @@
+use crate::canister_state::CanisterRandomnessGenerator;
 use crate::governance::REWARD_DISTRIBUTION_PERIOD_SECONDS;
 use crate::heap_governance_data::HeapGovernanceData;
 use crate::pb::v1::{RewardEvent, WaitForQuietState};
@@ -598,9 +599,10 @@ fn distribute_rewards_with_stable_neurons() -> BenchResult {
 
     let mut governance = Governance::new(
         governance_proto,
-        Box::new(MockEnvironment::new(vec![], now_seconds)),
-        Box::new(StubIcpLedger {}),
-        Box::new(StubCMC {}),
+        Arc::new(MockEnvironment::new(vec![], now_seconds)),
+        Arc::new(StubIcpLedger {}),
+        Arc::new(StubCMC {}),
+        Box::new(CanisterRandomnessGenerator::new()),
     );
 
     bench_fn(|| governance.distribute_rewards(Tokens::new(10_000_000, 0).unwrap()))