Remove solana-sdk from solana-udp-client (#3437)

* remove solana-sdk from solana-udp-client * fmt * post-rebase fix
anza-xyz · Nov 7, 2024 · 15b56c2 · 15b56c2
1 parent c199872
commit 15b56c2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/udp-client/Cargo.toml b/udp-client/Cargo.toml
@@ -12,8 +12,12 @@ edition = { workspace = true }
 [dependencies]
 async-trait = { workspace = true }
 solana-connection-cache = { workspace = true }
+solana-keypair = { workspace = true }
 solana-net-utils = { workspace = true }
-solana-sdk = { workspace = true }
 solana-streamer = { workspace = true }
+solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
+
+[dev-dependencies]
+solana-packet = { workspace = true }
diff --git a/udp-client/src/lib.rs b/udp-client/src/lib.rs
@@ -15,7 +15,7 @@ use {
         },
         connection_cache_stats::ConnectionCacheStats,
     },
-    solana_sdk::signature::Keypair,
+    solana_keypair::Keypair,
     std::{
         net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
         sync::Arc,

diff --git a/udp-client/src/nonblocking/udp_client.rs b/udp-client/src/nonblocking/udp_client.rs
@@ -4,9 +4,8 @@
 use {
     async_trait::async_trait, core::iter::repeat,
     solana_connection_cache::nonblocking::client_connection::ClientConnection,
-    solana_sdk::transport::Result as TransportResult,
-    solana_streamer::nonblocking::sendmmsg::batch_send, std::net::SocketAddr,
-    tokio::net::UdpSocket,
+    solana_streamer::nonblocking::sendmmsg::batch_send, solana_transaction_error::TransportResult,
+    std::net::SocketAddr, tokio::net::UdpSocket,
 };
 
 pub struct UdpClientConnection {
@@ -47,7 +46,7 @@ impl ClientConnection for UdpClientConnection {
 mod tests {
     use {
         super::*,
-        solana_sdk::packet::{Packet, PACKET_DATA_SIZE},
+        solana_packet::{Packet, PACKET_DATA_SIZE},
         solana_streamer::nonblocking::recvmmsg::recv_mmsg,
         std::net::{IpAddr, Ipv4Addr},
         tokio::net::UdpSocket,

diff --git a/udp-client/src/udp_client.rs b/udp-client/src/udp_client.rs
@@ -4,8 +4,8 @@
 use {
     core::iter::repeat,
     solana_connection_cache::client_connection::ClientConnection,
-    solana_sdk::transport::Result as TransportResult,
     solana_streamer::sendmmsg::batch_send,
+    solana_transaction_error::TransportResult,
     std::{
         net::{SocketAddr, UdpSocket},
         sync::Arc,