From 15b56c2af5c8cac992ce2d6d4c950eebb8ac99ed Mon Sep 17 00:00:00 2001
From: Kevin Heavey <heaveykevin2@gmail.com>
Date: Thu, 7 Nov 2024 12:21:18 +0400
Subject: [PATCH] Remove solana-sdk from solana-udp-client (#3437)

* remove solana-sdk from solana-udp-client

* fmt

* post-rebase fix
---
 Cargo.lock                               | 4 +++-
 programs/sbf/Cargo.lock                  | 3 ++-
 udp-client/Cargo.toml                    | 6 +++++-
 udp-client/src/lib.rs                    | 2 +-
 udp-client/src/nonblocking/udp_client.rs | 7 +++----
 udp-client/src/udp_client.rs             | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 784e9feaa668f2..d809f2da8f5990 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9069,9 +9069,11 @@ version = "2.2.0"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
+ "solana-keypair",
  "solana-net-utils",
- "solana-sdk",
+ "solana-packet",
  "solana-streamer",
+ "solana-transaction-error",
  "thiserror",
  "tokio",
 ]
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index 082e56e8d6ac65..e37574668f18e5 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -7557,9 +7557,10 @@ version = "2.2.0"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
+ "solana-keypair",
  "solana-net-utils",
- "solana-sdk",
  "solana-streamer",
+ "solana-transaction-error",
  "thiserror",
  "tokio",
 ]
diff --git a/udp-client/Cargo.toml b/udp-client/Cargo.toml
index e285159ff26c04..ba0319544569ad 100644
--- 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
index bb0c897a3dbc7a..cecb0664ae3217 100644
--- 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
index ab904914702954..56f6cc4f414ad3 100644
--- 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
index 9ca7d23df94b6a..4a257a2d748092 100644
--- 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,