resolve conflicts

anza-xyz · Nov 6, 2024 · 37176fe · 37176fe
1 parent a7cefc5
commit 37176fe
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/core/src/banking_stage/scheduler_messages.rs b/core/src/banking_stage/scheduler_messages.rs
@@ -1,13 +1,8 @@
 use {
-<<<<<<< HEAD
-    solana_sdk::{clock::Slot, transaction::SanitizedTransaction},
-=======
-    solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
     solana_sdk::{
         clock::{Epoch, Slot},
         transaction::SanitizedTransaction,
     },
->>>>>>> 5a6f518c60 (Store epoch in MaxAge (#3485))
     std::fmt::Display,
 };
 

diff --git a/core/src/banking_stage/transaction_scheduler/transaction_state.rs b/core/src/banking_stage/transaction_scheduler/transaction_state.rs
@@ -231,16 +231,8 @@ mod tests {
             ImmutableDeserializedPacket::new(Packet::from_data(None, tx.clone()).unwrap()).unwrap(),
         );
         let transaction_ttl = SanitizedTransactionTTL {
-<<<<<<< HEAD
             transaction: SanitizedTransaction::from_transaction_for_tests(tx),
-            max_age: MaxAge {
-                epoch_invalidation_slot: Slot::MAX,
-                alt_invalidation_slot: Slot::MAX,
-            },
-=======
-            transaction: RuntimeTransaction::from_transaction_for_tests(tx),
             max_age: MaxAge::MAX,
->>>>>>> 5a6f518c60 (Store epoch in MaxAge (#3485))
         };
         const TEST_TRANSACTION_COST: u64 = 5000;
         TransactionState::new(

diff --git a/core/src/banking_stage/transaction_scheduler/transaction_state_container.rs b/core/src/banking_stage/transaction_scheduler/transaction_state_container.rs
@@ -155,20 +155,14 @@ mod tests {
         super::*,
         crate::banking_stage::scheduler_messages::MaxAge,
         solana_sdk::{
-<<<<<<< HEAD
             compute_budget::ComputeBudgetInstruction,
             hash::Hash,
             message::Message,
             packet::Packet,
             signature::Keypair,
             signer::Signer,
-            slot_history::Slot,
             system_instruction,
             transaction::{SanitizedTransaction, Transaction},
-=======
-            compute_budget::ComputeBudgetInstruction, hash::Hash, message::Message, packet::Packet,
-            signature::Keypair, signer::Signer, system_instruction, transaction::Transaction,
->>>>>>> 5a6f518c60 (Store epoch in MaxAge (#3485))
         },
     };