refactor: rename UnifiedEvent to DexEvent

This commit is contained in:
ysq
2025-10-12 22:00:15 +08:00
parent e21f2cfd17
commit fd180935f8
38 changed files with 569 additions and 551 deletions
+6 -6
View File
@@ -31,7 +31,7 @@ async fn main() -> Result<()> {
let counter = event_counter.clone();
let callback =
move |event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {
move |event: solana_streamer_sdk::streaming::event_parser::DexEvent| {
let count = counter.fetch_add(1, Ordering::Relaxed);
let protocol = match event.metadata().event_type {
@@ -254,7 +254,7 @@ async fn main() -> Result<()> {
let shutdown_event_counter = Arc::new(AtomicU64::new(0));
let shutdown_counter = shutdown_event_counter.clone();
let shutdown_callback =
move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {
move |_event: solana_streamer_sdk::streaming::event_parser::DexEvent| {
shutdown_counter.fetch_add(1, Ordering::Relaxed);
};
@@ -327,7 +327,7 @@ async fn main() -> Result<()> {
println!("\n=== Subscription enforcement ===");
let test_callback =
|_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {};
|_event: solana_streamer_sdk::streaming::event_parser::DexEvent| {};
match client
.subscribe_events_immediate(
@@ -358,7 +358,7 @@ async fn main() -> Result<()> {
let client2_counter = Arc::new(AtomicU64::new(0));
let counter2 = client2_counter.clone();
let client2_callback =
move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {
move |_event: solana_streamer_sdk::streaming::event_parser::DexEvent| {
counter2.fetch_add(1, Ordering::Relaxed);
};
@@ -390,7 +390,7 @@ async fn main() -> Result<()> {
println!("\n=== Advanced subscription enforcement ===");
let test_callback_advanced =
|_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {};
|_event: solana_streamer_sdk::streaming::event_parser::DexEvent| {};
let client3 =
Arc::new(YellowstoneGrpc::new(GRPC_ENDPOINT.to_string(), API_KEY.map(|s| s.to_string()))?);
@@ -447,7 +447,7 @@ async fn main() -> Result<()> {
let client4_counter = Arc::new(AtomicU64::new(0));
let counter4 = client4_counter.clone();
let client4_callback =
move |_event: solana_streamer_sdk::streaming::event_parser::UnifiedEvent| {
move |_event: solana_streamer_sdk::streaming::event_parser::DexEvent| {
counter4.fetch_add(1, Ordering::Relaxed);
};
+4 -4
View File
@@ -7,7 +7,7 @@ use solana_streamer_sdk::streaming::{
raydium_clmm::parser::RAYDIUM_CLMM_PROGRAM_ID,
raydium_cpmm::parser::RAYDIUM_CPMM_PROGRAM_ID,
},
Protocol, UnifiedEvent,
Protocol, DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -108,15 +108,15 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| {
println!(
"🎉 Event received! Type: {:?}, transaction_index: {:?}",
event.metadata().event_type,
event.metadata().transaction_index
);
match event {
UnifiedEvent::BlockMetaEvent(e) => {
DexEvent::BlockMetaEvent(e) => {
println!("{:?}", e);
}
// .... other events
@@ -4,7 +4,7 @@ use solana_sdk::pubkey::Pubkey;
use solana_streamer_sdk::streaming::{
event_parser::{
common::{filter::EventTypeFilter, EventType},
UnifiedEvent,
DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -102,9 +102,9 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| match event {
UnifiedEvent::TokenAccountEvent(e) => {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| match event {
DexEvent::TokenAccountEvent(e) => {
println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount);
}
_ => {}
+3 -3
View File
@@ -1,7 +1,7 @@
use solana_streamer_sdk::streaming::{
event_parser::{
common::{filter::EventTypeFilter, EventType},
UnifiedEvent,
DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -75,8 +75,8 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| {
println!("🎉 Event received! {:?}", event);
}
}
+2 -2
View File
@@ -2,7 +2,7 @@ use anyhow::Result;
use solana_commitment_config::CommitmentConfig;
use solana_streamer_sdk::streaming::event_parser::core::event_parser::EventParser;
use solana_streamer_sdk::streaming::event_parser::Protocol;
use solana_streamer_sdk::streaming::event_parser::UnifiedEvent;
use solana_streamer_sdk::streaming::event_parser::DexEvent;
use std::str::FromStr;
use std::sync::Arc;
/// Get transaction data based on transaction signature
@@ -101,7 +101,7 @@ async fn get_single_transaction_details(signature_str: &str) -> Result<()> {
None,
signature,
transaction,
Arc::new(move |event: &UnifiedEvent| {
Arc::new(move |event: &DexEvent| {
println!("{:?}\n", event);
}),
)
@@ -4,7 +4,7 @@ use solana_sdk::pubkey::Pubkey;
use solana_streamer_sdk::streaming::{
event_parser::{
common::{filter::EventTypeFilter, EventType},
UnifiedEvent,
DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -104,9 +104,9 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| match event {
UnifiedEvent::TokenAccountEvent(e) => {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| match event {
DexEvent::TokenAccountEvent(e) => {
println!("TokenAccount: {:?} amount: {:?}", e.pubkey, e.amount);
}
_ => {}
+4 -4
View File
@@ -1,5 +1,5 @@
use solana_streamer_sdk::streaming::{
event_parser::{Protocol, UnifiedEvent},
event_parser::{Protocol, DexEvent},
shred::StreamClientConfig,
ShredStreamGrpc,
};
@@ -54,15 +54,15 @@ async fn test_shreds() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| {
println!(
"🎉 Event received! Type: {:?}, transaction_index: {:?}",
event.metadata().event_type,
event.metadata().transaction_index
);
match event {
UnifiedEvent::BlockMetaEvent(e) => {
DexEvent::BlockMetaEvent(e) => {
println!("BlockMetaEvent: {:?}", e.metadata.handle_us);
}
_ => {}
+3 -3
View File
@@ -1,7 +1,7 @@
use solana_streamer_sdk::streaming::{
event_parser::{
common::{filter::EventTypeFilter, EventType},
UnifiedEvent,
DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -76,8 +76,8 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| {
println!("🎉 Event received! {:?}", event);
}
}
+4 -4
View File
@@ -1,7 +1,7 @@
use solana_streamer_sdk::streaming::{
event_parser::{
common::{filter::EventTypeFilter, EventType},
UnifiedEvent,
DexEvent,
},
grpc::ClientConfig,
yellowstone_grpc::{AccountFilter, TransactionFilter},
@@ -76,9 +76,9 @@ async fn test_grpc() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn create_event_callback() -> impl Fn(UnifiedEvent) {
|event: UnifiedEvent| match event {
UnifiedEvent::TokenInfoEvent(e) => {
fn create_event_callback() -> impl Fn(DexEvent) {
|event: DexEvent| match event {
DexEvent::TokenInfoEvent(e) => {
println!("TokenInfoEvent: {:?}", e.decimals);
}
_ => {}