remove grpc_subscription.rs

src/grpc_subscription.rs

@@ -1,78 +0,0 @@
-use anyhow::{bail, Context};
-use futures::StreamExt;
-
-use solana_sdk::commitment_config::CommitmentConfig;
-use std::collections::HashMap;
-use tokio::sync::broadcast::Sender;
-use yellowstone_grpc_client::GeyserGrpcClient;
-use yellowstone_grpc_proto::prelude::{
-    subscribe_update::UpdateOneof, CommitmentLevel, SubscribeRequestFilterBlocks,
-    SubscribeUpdateBlock,
-};
-
-pub fn create_block_processing_task(
-    grpc_addr: String,
-    grpc_x_token: Option<String>,
-    block_sx: Sender<SubscribeUpdateBlock>,
-    commitment_level: CommitmentLevel,
-) -> tokio::task::JoinHandle<anyhow::Result<()>> {
-    let mut blocks_subs = HashMap::new();
-    blocks_subs.insert(
-        "client".to_string(),
-        SubscribeRequestFilterBlocks {
-            account_include: Default::default(),
-            include_transactions: Some(true),
-            include_accounts: Some(false),
-            include_entries: Some(false),
-        },
-    );
-
-    let _commitment_config = match commitment_level {
-        CommitmentLevel::Confirmed => CommitmentConfig::confirmed(),
-        CommitmentLevel::Finalized => CommitmentConfig::finalized(),
-        CommitmentLevel::Processed => CommitmentConfig::processed(),
-    };
-
-    tokio::spawn(async move {
-        // connect to grpc
-        let mut client = GeyserGrpcClient::connect(grpc_addr, grpc_x_token, None)?;
-        let mut stream = client
-            .subscribe_once(
-                HashMap::new(),
-                Default::default(),
-                HashMap::new(),
-                Default::default(),
-                blocks_subs,
-                Default::default(),
-                Some(commitment_level),
-                Default::default(),
-                None,
-            )
-            .await?;
-
-        while let Some(message) = stream.next().await {
-            let message = message?;
-
-            let Some(update) = message.update_oneof else {
-                continue;
-            };
-
-            match update {
-                UpdateOneof::Block(block) => {
-                    // let block = map_produced_block(block, commitment_config);
-
-                    block_sx
-                        .send(block)
-                        .context("Grpc failed to send a block")?;
-                }
-                UpdateOneof::Ping(_) => {
-                    log::trace!("GRPC Ping");
-                }
-                u => {
-                    bail!("Unexpected update: {u:?}");
-                }
-            };
-        }
-        bail!("geyser slot stream ended");
-    })
-}

src/grpc_subscription_autoreconnect_tasks.rs

@@ -291,10 +291,10 @@ pub fn create_geyser_autoconnection_task(
                                 break 'recv_loop ConnectionState::WaitReconnect(attempt);
                             }
                         }
-                    } // -- end loop
+                    } // -- END receive loop
                 }
-            }
-        }
+            } // -- END match
+        } // -- endless state loop
     });
 
     (jh_geyser_task.abort_handle(), receiver_channel)

src/lib.rs

@@ -9,7 +9,6 @@ use yellowstone_grpc_proto::geyser::{
 use yellowstone_grpc_proto::tonic::transport::ClientTlsConfig;
 
 pub mod channel_plugger;
-pub mod grpc_subscription;
 pub mod grpc_subscription_autoreconnect_streams;
 pub mod grpc_subscription_autoreconnect_tasks;
 pub mod grpcmultiplex_fastestwins;