review cleanup

Author: JamesMDunn

crates/plugin/src/selectors.rs

@@ -1,6 +1,6 @@
 use hashbrown::HashMap;
 use itertools::Itertools;
-use solana_transaction::{versioned::VersionedTransaction, VersionedMessage};
+use solana_transaction::versioned::VersionedTransaction;
 use solana_transaction_status::TransactionStatusMeta;
 
 use crate::{
@@ -80,19 +80,9 @@ impl TransactionSelector {
         if is_vote {
             return None;
         }
+        let instructions = &tx.message.instructions();
 
-        let instructions;
-        let keys;
-        match &tx.message {
-            VersionedMessage::Legacy(msg) => {
-                keys = &msg.account_keys;
-                instructions = &msg.instructions;
-            },
-            VersionedMessage::V0(msg) => {
-                keys = &msg.account_keys;
-                instructions = &msg.instructions;
-            },
-        }
+        let keys = &tx.message.static_account_keys();
 
         let pubkey_routes = keys
             .iter()

crates/plugin/src/sender.rs

@@ -112,7 +112,7 @@ impl Sender {
         Ok(producer)
     }
 
-    async fn connect(&self) -> Result<RwLockReadGuard<Producer>, indexer_rabbitmq::Error> {
+    async fn connect(&self) -> Result<RwLockReadGuard<'_, Producer>, indexer_rabbitmq::Error> {
         if self.is_stopped() {
             return Err(indexer_rabbitmq::Error::Other("Sender is stopped"));
         }

crates/plugin/src/stats.rs

@@ -6,7 +6,6 @@ use crate::prelude::*;
 use indexer_rabbitmq::geyser::{Message, SlotStatistics};
 use solana_sdk::message::compiled_instruction::CompiledInstruction;
 use solana_transaction::versioned::VersionedTransaction;
-use solana_transaction::VersionedMessage;
 use solana_transaction_status::TransactionStatusMeta;
 
 use crate::sender::Sender;
@@ -255,15 +254,7 @@ fn process_slot(
     }
 
     let msg = &vtx.message;
-    let keys;
-    match &msg {
-        VersionedMessage::Legacy(msg) => {
-            keys = &msg.account_keys;
-        },
-        VersionedMessage::V0(msg) => {
-            keys = &msg.account_keys;
-        },
-    }
+    let keys = msg.static_account_keys();
 
     let inner_ixs: Vec<(&Pubkey, &CompiledInstruction)> = meta
         .inner_instructions

crates/rabbitmq/src/geyser.rs

@@ -543,7 +543,7 @@ impl crate::QueueType for QueueType {
     type Message = Message;
 
     #[inline]
-    fn info(&self) -> crate::queue_type::QueueInfo {
+    fn info(&self) -> crate::queue_type::QueueInfo<'_> {
         (&self.props).into()
     }
 }

crates/rabbitmq/src/queue_type.rs

@@ -25,7 +25,7 @@ pub trait QueueType {
     type Message;
 
     /// Expose the underlying queue info for this queue
-    fn info(&self) -> QueueInfo;
+    fn info(&self) -> QueueInfo<'_>;
 }
 
 #[derive(Debug, Clone)]