Generalize matching criteria for tombstone at boot up (#31547)

Generalize matching criteria for tombstone at bootup
solana-labs · May 9, 2023 · 3845423 · 3845423
1 parent 6a4a041
commit 3845423
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs
@@ -318,7 +318,7 @@ impl LoadedProgramsForTxBatch {
 
 pub enum LoadedProgramMatchCriteria {
     DeployedOnOrAfterSlot(Slot),
-    Closed,
+    Tombstone,
     NoCriteria,
 }
 
@@ -410,9 +410,7 @@ impl LoadedPrograms {
             LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot) => {
                 program.deployment_slot >= *slot
             }
-            LoadedProgramMatchCriteria::Closed => {
-                matches!(program.program, LoadedProgramType::Closed)
-            }
+            LoadedProgramMatchCriteria::Tombstone => program.is_tombstone(),
             LoadedProgramMatchCriteria::NoCriteria => true,
         }
     }

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -4461,7 +4461,7 @@ impl Bank {
                         (
                             *pubkey,
                             self.program_modification_slot(pubkey)
-                                .map_or(LoadedProgramMatchCriteria::Closed, |slot| {
+                                .map_or(LoadedProgramMatchCriteria::Tombstone, |slot| {
                                     LoadedProgramMatchCriteria::DeployedOnOrAfterSlot(slot)
                                 }),
                         )