refactor: Make validator_signer mutable

chain/chain/src/doomslug.rs

@@ -1,6 +1,7 @@
 use crate::doomslug::trackable::TrackableBlockHeightValue;
 use crate::metrics;
 use near_async::time::{Clock, Duration, Instant, Utc};
+use near_chain_configs::MutableConfigValue;
 use near_client_primitives::debug::{ApprovalAtHeightStatus, ApprovalHistoryEntry};
 use near_crypto::Signature;
 use near_primitives::block::{Approval, ApprovalInner};
@@ -138,7 +139,7 @@ pub struct Doomslug {
     endorsement_pending: bool,
     /// Information to track the timer (see `start_timer` routine in the paper)
     timer: DoomslugTimer,
-    signer: Option<Arc<ValidatorSigner>>,
+    signer: MutableConfigValue<Option<Arc<ValidatorSigner>>>,
     /// How many approvals to have before producing a block. In production should be always `HalfStake`,
     ///    but for many tests we use `NoApprovals` to invoke more forkfulness
     threshold_mode: DoomslugThresholdMode,
@@ -362,7 +363,7 @@ impl Doomslug {
         min_delay: Duration,
         delay_step: Duration,
         max_delay: Duration,
-        signer: Option<Arc<ValidatorSigner>>,
+        signer: MutableConfigValue<Option<Arc<ValidatorSigner>>>,
         threshold_mode: DoomslugThresholdMode,
     ) -> Self {
         Doomslug {
@@ -542,8 +543,8 @@ impl Doomslug {
     }
 
     fn create_approval(&self, target_height: BlockHeight) -> Option<Approval> {
-        self.signer.as_ref().map(|signer| {
-            Approval::new(self.tip.block_hash, self.tip.height, target_height, &**signer)
+        self.signer.get().map(|signer| {
+            Approval::new(self.tip.block_hash, self.tip.height, target_height, &*signer)
         })
     }
 
@@ -777,6 +778,7 @@ mod tests {
     };
     use crate::Doomslug;
     use near_async::time::{Duration, FakeClock, Utc};
+    use near_chain_configs::MutableConfigValue;
     use near_crypto::{KeyType, SecretKey};
     use near_primitives::block::{Approval, ApprovalInner};
     use near_primitives::hash::hash;
@@ -787,14 +789,18 @@ mod tests {
     #[test]
     fn test_endorsements_and_skips_basic() {
         let clock = FakeClock::new(Utc::UNIX_EPOCH);
+        let validator = MutableConfigValue::new(
+            Some(Arc::new(create_test_signer("test").into())),
+            "validator_signer",
+        );
         let mut ds = Doomslug::new(
             clock.clock(),
             0,
             Duration::milliseconds(400),
             Duration::milliseconds(1000),
             Duration::milliseconds(100),
             Duration::milliseconds(3000),
-            Some(Arc::new(create_test_signer("test"))),
+            validator,
             DoomslugThresholdMode::TwoThirds,
         );
 
@@ -942,7 +948,10 @@ mod tests {
             .map(|(account_id, _, _)| create_test_signer(account_id))
             .collect::<Vec<_>>();
 
-        let signer = Arc::new(create_test_signer("test"));
+        let signer = MutableConfigValue::new(
+            Some(Arc::new(create_test_signer("test").into())),
+            "validator_signer",
+        );
         let clock = FakeClock::new(Utc::UNIX_EPOCH);
         let mut ds = Doomslug::new(
             clock.clock(),
@@ -951,7 +960,7 @@ mod tests {
             Duration::milliseconds(1000),
             Duration::milliseconds(100),
             Duration::milliseconds(3000),
-            Some(signer),
+            signer,
             DoomslugThresholdMode::TwoThirds,
         );
 

chain/chain/src/tests/doomslug.rs

@@ -1,5 +1,6 @@
 use crate::{Doomslug, DoomslugThresholdMode};
 use near_async::time::{Duration, FakeClock, Instant, Utc};
+use near_chain_configs::MutableConfigValue;
 use near_crypto::{KeyType, SecretKey};
 use near_primitives::block::Approval;
 use near_primitives::hash::{hash, CryptoHash};
@@ -47,7 +48,12 @@ fn one_iter(
         .collect::<Vec<_>>();
     let signers = account_ids
         .iter()
-        .map(|account_id| Arc::new(create_test_signer(account_id)))
+        .map(|account_id| {
+            MutableConfigValue::new(
+                Some(Arc::new(create_test_signer(account_id))),
+                "validator_signer",
+            )
+        })
         .collect::<Vec<_>>();
     let clock = FakeClock::new(Utc::UNIX_EPOCH);
     let mut doomslugs = signers
@@ -60,7 +66,7 @@ fn one_iter(
                 Duration::milliseconds(1000),
                 Duration::milliseconds(100),
                 delta * 20, // some arbitrary number larger than delta * 6
-                Some(signer.clone()),
+                signer.clone(),
                 DoomslugThresholdMode::TwoThirds,
             )
         })