fix: reconciliate main

txtx · Feb 17, 2025 · 24be23b · 24be23b
1 parent 1e95232
commit 24be23b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/src/rpc/full.rs b/crates/core/src/rpc/full.rs
@@ -1,6 +1,6 @@
+use super::utils::{decode_and_deserialize, transform_tx_metadata_to_ui_accounts};
 use crate::simnet::{EntryStatus, TransactionWithStatusMeta};
 use crate::types::TransactionStatusEvent;
-use super::utils::{decode_and_deserialize, transform_tx_metadata_to_ui_accounts};
 use itertools::Itertools;
 use jsonrpc_core::futures::future::{self, join_all};
 use jsonrpc_core::BoxFuture;
@@ -938,12 +938,14 @@ mod tests {
             .unwrap();
 
         match mempool_rx.recv() {
-            Ok((_hash, _tx, status_tx)) => {
+            Ok(SimnetCommand::TransactionReceived(_, _, status_tx, _)) => {
                 status_tx
-                    .send(TransactionConfirmationStatus::Confirmed)
+                    .send(TransactionStatusEvent::Success(
+                        TransactionConfirmationStatus::Confirmed,
+                    ))
                     .unwrap();
             }
-            Err(_) => panic!("failed to receive transaction from mempool"),
+            _ => panic!("failed to receive transaction from mempool"),
         }
 
         assert_eq!(

diff --git a/crates/core/src/test_helpers.rs b/crates/core/src/test_helpers.rs
@@ -17,6 +17,7 @@ use solana_transaction_status::TransactionConfirmationStatus;
 use crate::{
     rpc::RunloopContext,
     simnet::{EntryStatus, GlobalState, TransactionWithStatusMeta},
+    types::SimnetCommand,
 };
 
 pub struct TestSetup<T> {
@@ -26,7 +27,8 @@ pub struct TestSetup<T> {
 
 impl<T> TestSetup<T> {
     pub fn new(rpc: T) -> Self {
-        let (mempool_tx, _rx) = crossbeam_channel::unbounded();
+        let (simnet_commands_tx, _rx) = crossbeam_channel::unbounded();
+        let (plugin_manager_commands_tx, _rx) = crossbeam_channel::unbounded();
 
         let mut svm = LiteSVM::new();
         let clock = Clock {
@@ -40,7 +42,8 @@ impl<T> TestSetup<T> {
 
         TestSetup {
             context: RunloopContext {
-                mempool_tx,
+                simnet_commands_tx,
+                plugin_manager_commands_tx,
                 id: Hash::new_unique(),
                 state: Arc::new(RwLock::new(GlobalState {
                     svm,
@@ -74,16 +77,9 @@ impl<T> TestSetup<T> {
         setup
     }
 
-    pub fn new_with_mempool(
-        rpc: T,
-        mempool_tx: Sender<(
-            Hash,
-            VersionedTransaction,
-            Sender<TransactionConfirmationStatus>,
-        )>,
-    ) -> Self {
+    pub fn new_with_mempool(rpc: T, simnet_commands_tx: Sender<SimnetCommand>) -> Self {
         let mut setup = TestSetup::new(rpc);
-        setup.context.mempool_tx = mempool_tx;
+        setup.context.simnet_commands_tx = simnet_commands_tx;
         setup
     }