address review comments

solana-labs · May 10, 2023 · 5521825 · 5521825
1 parent 25ff300
commit 5521825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs
@@ -570,7 +570,7 @@ impl LoadedPrograms {
         }
     }
 
-    pub fn unload_program(&mut self, id: &Pubkey) {
+    fn unload_program(&mut self, id: &Pubkey) {
         if let Some(entries) = self.entries.get_mut(id) {
             entries.iter_mut().for_each(|entry| {
                 if entry.is_loaded() {

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -4053,11 +4053,11 @@ impl Bank {
     }
 
     /// Unload a program from the bank's cache
-    fn unload_program(&self, pubkey: &Pubkey) {
+    fn remove_program_from_cache(&self, pubkey: &Pubkey) {
         self.loaded_programs_cache
             .write()
             .unwrap()
-            .unload_program(pubkey);
+            .remove_programs([*pubkey].into_iter());
     }
 
     fn program_modification_slot(&self, pubkey: &Pubkey) -> Result<Slot> {
@@ -7577,7 +7577,7 @@ impl Bank {
                 // Clear new account
                 self.store_account(new_address, &AccountSharedData::default());
 
-                self.unload_program(old_address);
+                self.remove_program_from_cache(old_address);
 
                 self.calculate_and_update_accounts_data_size_delta_off_chain(
                     old_account.data().len(),