From 744ac1535fe8ef9540d93a73e907f24126107495 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)"
 <75863576+jeffwashington@users.noreply.github.com>
Date: Mon, 3 May 2021 10:45:15 -0500
Subject: [PATCH] tests: lamports -> ReadableAccount (#16983)

---
 runtime/src/bank.rs              | 14 +++++++++-----
 runtime/src/message_processor.rs | 11 ++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 9cc6ce165d..826e2d4360 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -5428,8 +5428,9 @@ pub(crate) mod tests {
         // Make native instruction loader rent exempt
         let system_program_id = system_program::id();
         let mut system_program_account = bank.get_account(&system_program_id).unwrap();
-        system_program_account.lamports =
-            bank.get_minimum_balance_for_rent_exemption(system_program_account.data().len());
+        system_program_account.set_lamports(
+            bank.get_minimum_balance_for_rent_exemption(system_program_account.data().len()),
+        );
         bank.store_account(&system_program_id, &system_program_account);
         bank_with_success_txs.store_account(&system_program_id, &system_program_account);
 
@@ -5484,7 +5485,10 @@ pub(crate) mod tests {
                         .account
                         .borrow_mut()
                         .checked_add_lamports(1)?;
-                    keyed_accounts[2].account.borrow_mut().lamports -= 1;
+                    keyed_accounts[2]
+                        .account
+                        .borrow_mut()
+                        .checked_sub_lamports(1)?;
                     Ok(())
                 }
             }
@@ -9904,8 +9908,8 @@ pub(crate) mod tests {
             {
                 let mut to_account = keyed_accounts[1].try_account_ref_mut()?;
                 let mut dup_account = keyed_accounts[2].try_account_ref_mut()?;
-                dup_account.lamports -= lamports;
-                to_account.checked_add_lamports(lamports).unwrap();
+                dup_account.checked_sub_lamports(lamports)?;
+                to_account.checked_add_lamports(lamports)?;
             }
             keyed_accounts[0]
                 .try_account_ref_mut()?
diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs
index c313293524..0198454170 100644
--- a/runtime/src/message_processor.rs
+++ b/runtime/src/message_processor.rs
@@ -1829,7 +1829,10 @@ mod tests {
                 match instruction {
                     MockSystemInstruction::Correct => Ok(()),
                     MockSystemInstruction::AttemptCredit { lamports } => {
-                        keyed_accounts[0].account.borrow_mut().lamports -= lamports;
+                        keyed_accounts[0]
+                            .account
+                            .borrow_mut()
+                            .checked_sub_lamports(lamports)?;
                         keyed_accounts[1]
                             .account
                             .borrow_mut()
@@ -2009,11 +2012,13 @@ mod tests {
                         {
                             let mut to_account = keyed_accounts[1].try_account_ref_mut()?;
                             let mut dup_account = keyed_accounts[2].try_account_ref_mut()?;
-                            dup_account.lamports -= lamports;
+                            dup_account.checked_sub_lamports(lamports)?;
                             to_account.checked_add_lamports(lamports)?;
                             dup_account.set_data(vec![data]);
                         }
-                        keyed_accounts[0].try_account_ref_mut()?.lamports -= lamports;
+                        keyed_accounts[0]
+                            .try_account_ref_mut()?
+                            .checked_sub_lamports(lamports)?;
                         keyed_accounts[1]
                             .try_account_ref_mut()?
                             .checked_add_lamports(lamports)?;