Merge pull request #42 from helium/madninja/tpu_conduit

Refactor transaction sender

Author: ChewingGlass

solana-transaction-utils/src/error.rs

@@ -1,5 +1,4 @@
 use solana_sdk::{message::CompileError, transaction::TransactionError};
-use solana_tpu_client::tpu_client::TpuSenderError;
 
 #[derive(Debug, thiserror::Error, Clone)]
 pub enum Error {
@@ -15,8 +14,8 @@ pub enum Error {
     SignerError(String),
     #[error("Ix group too large")]
     IxGroupTooLarge,
-    #[error("TPU sender error: {0}")]
-    TpuSenderError(String),
+    #[error("Max retries exceeded")]
+    MaxRetriesExceeded,
     #[error("Transaction error: {0}")]
     TransactionError(TransactionError),
     #[error("Simulated transaction error: {0}")]
@@ -29,8 +28,6 @@ pub enum Error {
     FeeTooHigh,
     #[error("Transaction has failed too many retries and gone stale")]
     StaleTransaction,
-    #[error("System time error: {0}")]
-    SystemTimeError(String),
     #[error("message channel closed")]
     ChannelClosed,
 }
@@ -41,12 +38,6 @@ impl From<solana_client::client_error::ClientError> for Error {
     }
 }
 
-impl From<TpuSenderError> for Error {
-    fn from(value: TpuSenderError) -> Self {
-        Self::TpuSenderError(value.to_string())
-    }
-}
-
 impl<T> From<tokio::sync::mpsc::error::SendError<T>> for Error {
     fn from(_value: tokio::sync::mpsc::error::SendError<T>) -> Self {
         Self::ChannelClosed

solana-transaction-utils/src/send_and_confirm_transactions_in_parallel.rs

@@ -23,7 +23,6 @@ use solana_sdk::{
     signers::Signers,
     transaction::{TransactionError, VersionedTransaction},
 };
-use solana_tpu_client::tpu_client::TpuSenderError;
 use tokio::{sync::RwLock, task::JoinHandle};
 
 use crate::error::Error;
@@ -217,7 +216,7 @@ async fn send_transaction_with_rpc_fallback(
                     context.error_map.insert(index, transaction_error.clone());
                 }
                 _ => {
-                    return Err(TpuSenderError::from(e).into());
+                    return Err(crate::Error::from(e));
                 }
             }
         }
@@ -521,6 +520,6 @@ pub async fn send_and_confirm_transactions_in_parallel<T: Signers + ?Sized>(
         }
         Ok(transaction_errors)
     } else {
-        Err(TpuSenderError::Custom("Max retries exceeded".into()).into())
+        Err(crate::Error::MaxRetriesExceeded)
     }
 }