Define register_unique_recent_blockhash_for_test

program-test/src/lib.rs

@@ -888,7 +888,7 @@ impl ProgramTest {
                     .read()
                     .unwrap()
                     .working_bank()
-                    .register_recent_blockhash(&Hash::new_unique());
+                    .register_unique_recent_blockhash_for_test();
             }
         });
 
@@ -1040,7 +1040,7 @@ impl ProgramTestContext {
                         .read()
                         .unwrap()
                         .working_bank()
-                        .register_recent_blockhash(&Hash::new_unique());
+                        .register_unique_recent_blockhash_for_test();
                 }
             }),
         );

programs/sbf/tests/programs.rs

@@ -4006,7 +4006,7 @@ fn test_cpi_account_ownership_writability() {
                 TEST_FORBID_WRITE_AFTER_OWNERSHIP_CHANGE_IN_CALLEE,
                 TEST_FORBID_WRITE_AFTER_OWNERSHIP_CHANGE_IN_CALLER,
             ] {
-                bank.register_recent_blockhash(&Hash::new_unique());
+                bank.register_unique_recent_blockhash_for_test();
                 let account = AccountSharedData::new(42, account_size, &invoke_program_id);
                 bank.store_account(&account_keypair.pubkey(), &account);
 

runtime/src/bank.rs

@@ -4185,6 +4185,12 @@ impl Bank {
         self.update_recent_blockhashes_locked(&w_blockhash_queue);
     }
 
+    // gating this under #[cfg(feature = "dev-context-only-utils")] isn't easy due to
+    // solana-program-test's usage...
+    pub fn register_unique_recent_blockhash_for_test(&self) {
+        self.register_recent_blockhash(&Hash::new_unique())
+    }
+
     /// Tell the bank which Entry IDs exist on the ledger. This function assumes subsequent calls
     /// correspond to later entries, and will boot the oldest ones once its internal cache is full.
     /// Once boot, the bank will reject transactions using that `hash`.

runtime/src/bank/tests.rs

@@ -13359,7 +13359,7 @@ fn test_program_execution_restricted_for_stake_account_in_reward_period() {
         // Push a dummy blockhash, so that the latest_blockhash() for the transfer transaction in each
         // iteration are different. Otherwise, all those transactions will be the same, and will not be
         // executed by the bank except the first one.
-        bank.register_recent_blockhash(&Hash::new_unique());
+        bank.register_unique_recent_blockhash_for_test();
         previous_bank = Arc::new(bank);
     }
 }