Forge a confirmed root before halting for RPC inspection (#10061) (#1…

…0067) automerge
solana-labs · May 15, 2020 · b6d6ff7 · b6d6ff7
1 parent b9a8015
commit b6d6ff7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/commitment.rs b/core/src/commitment.rs
@@ -180,7 +180,6 @@ impl BlockCommitmentCache {
         }
     }
 
-    #[cfg(test)]
     pub(crate) fn set_get_largest_confirmed_root(&mut self, root: Slot) {
         self.largest_confirmed_root = root;
     }

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -318,6 +318,13 @@ impl Validator {
         );
 
         if config.dev_halt_at_slot.is_some() {
+            // Simulate a confirmed root to avoid RPC errors with CommitmentmentConfig::max() and
+            // to ensure RPC endpoints like getConfirmedBlock, which require a confirmed root, work
+            block_commitment_cache
+                .write()
+                .unwrap()
+                .set_get_largest_confirmed_root(bank_forks.read().unwrap().root());
+
             // Park with the RPC service running, ready for inspection!
             warn!("Validator halted");
             std::thread::park();