From f4718be22f0c6cbe7553db9e28c97f830eec3d08 Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Wed, 6 Jul 2022 19:59:34 +0200
Subject: [PATCH] Clean up `leave_nonce_on_success` feature (#26447)

Clean up leave_nonce_on_success feature
---
 runtime/src/accounts.rs | 15 +--------------
 runtime/src/bank.rs     |  6 ------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
index 8dac900c79..3ecca73ea0 100644
--- a/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -1191,7 +1191,6 @@ impl Accounts {
         rent_collector: &RentCollector,
         durable_nonce: &DurableNonce,
         lamports_per_signature: u64,
-        leave_nonce_on_success: bool,
     ) {
         let (accounts_to_store, txn_signatures) = self.collect_accounts_to_store(
             txs,
@@ -1200,7 +1199,6 @@ impl Accounts {
             rent_collector,
             durable_nonce,
             lamports_per_signature,
-            leave_nonce_on_success,
         );
         self.accounts_db
             .store_cached((slot, &accounts_to_store[..]), Some(&txn_signatures));
@@ -1227,7 +1225,6 @@ impl Accounts {
         rent_collector: &RentCollector,
         durable_nonce: &DurableNonce,
         lamports_per_signature: u64,
-        leave_nonce_on_success: bool,
     ) -> (
         Vec<(&'a Pubkey, &'a AccountSharedData)>,
         Vec<Option<&'a Signature>>,
@@ -1247,17 +1244,10 @@ impl Accounts {
             };
 
             let maybe_nonce = match (execution_status, &*nonce) {
-                (Ok(()), Some(nonce)) => {
-                    if leave_nonce_on_success {
-                        None
-                    } else {
-                        Some((nonce, false /* rollback */))
-                    }
-                }
+                (Ok(_), _) => None, // Success, don't do any additional nonce processing
                 (Err(_), Some(nonce)) => {
                     Some((nonce, true /* rollback */))
                 }
-                (Ok(_), None) => None, // Success, don't do any additional nonce processing
                 (Err(_), None) => {
                     // Fees for failed transactions which don't use durable nonces are
                     // deducted in Bank::filter_program_errors_and_collect_fee
@@ -3005,7 +2995,6 @@ mod tests {
             &rent_collector,
             &DurableNonce::default(),
             0,
-            true, // leave_nonce_on_success
         );
         assert_eq!(collected_accounts.len(), 2);
         assert!(collected_accounts
@@ -3489,7 +3478,6 @@ mod tests {
             &rent_collector,
             &durable_nonce,
             0,
-            true, // leave_nonce_on_success
         );
         assert_eq!(collected_accounts.len(), 2);
         assert_eq!(
@@ -3604,7 +3592,6 @@ mod tests {
             &rent_collector,
             &durable_nonce,
             0,
-            true, // leave_nonce_on_success
         );
         assert_eq!(collected_accounts.len(), 1);
         let collected_nonce_account = collected_accounts
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 2d8cc99233..7e22e3bb77 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -4929,7 +4929,6 @@ impl Bank {
             &self.rent_collector,
             &durable_nonce,
             lamports_per_signature,
-            self.leave_nonce_on_success(),
         );
         let rent_debits = self.collect_rent(&execution_results, loaded_txs);
 
@@ -7267,11 +7266,6 @@ impl Bank {
             .is_active(&feature_set::credits_auto_rewind::id())
     }
 
-    pub fn leave_nonce_on_success(&self) -> bool {
-        self.feature_set
-            .is_active(&feature_set::leave_nonce_on_success::id())
-    }
-
     pub fn send_to_tpu_vote_port_enabled(&self) -> bool {
         self.feature_set
             .is_active(&feature_set::send_to_tpu_vote_port::id())