Simplify types slightly

solana-labs · Dec 9, 2021 · 5ed9c97 · 5ed9c97
1 parent 619d462
commit 5ed9c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -238,7 +238,8 @@ impl ExecuteTimings {
 type BankStatusCache = StatusCache<Result<()>>;
 #[frozen_abi(digest = "32EjVUc6shHHVPpsnBAVfyBziMgyFzH8qxisLwmwwdS1")]
 pub type BankSlotDelta = SlotDelta<Result<()>>;
-type TransactionAccountRefCells = Vec<(Pubkey, Rc<RefCell<AccountSharedData>>)>;
+pub(crate) type TransactionAccountRefCell = (Pubkey, Rc<RefCell<AccountSharedData>>);
+type TransactionAccountRefCells = Vec<TransactionAccountRefCell>;
 
 // Eager rent collection repeats in cyclic manner.
 // Each cycle is composed of <partition_count> number of tiny pubkey subranges

diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs
@@ -1,4 +1,5 @@
 use {
+    crate::bank::TransactionAccountRefCell,
     serde::{Deserialize, Serialize},
     solana_measure::measure::Measure,
     solana_program_runtime::{
@@ -45,7 +46,7 @@ impl MessageProcessor {
         builtin_programs: &[BuiltinProgram],
         message: &Message,
         program_indices: &[Vec<usize>],
-        accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
+        accounts: &[TransactionAccountRefCell],
         rent: Rent,
         log_collector: Option<Rc<RefCell<LogCollector>>>,
         executors: Rc<RefCell<Executors>>,
@@ -128,7 +129,7 @@ mod tests {
         super::*,
         crate::rent_collector::RentCollector,
         solana_sdk::{
-            account::ReadableAccount,
+            account::{AccountSharedData, ReadableAccount},
             instruction::{AccountMeta, Instruction, InstructionError},
             keyed_account::keyed_account_at_index,
             message::Message,