remove solana_sdk::rpc_port dependencies (#6231)

Cargo.lock

@@ -454,7 +454,6 @@ dependencies = [
  "solana-rpc-client",
  "solana-rpc-client-api",
  "solana-runtime",
- "solana-sdk",
  "solana-sdk-ids",
  "solana-send-transaction-service",
  "solana-signer",
@@ -7387,7 +7386,6 @@ dependencies = [
  "solana-rpc-client-api",
  "solana-rpc-client-nonce-utils",
  "solana-sbpf",
- "solana-sdk",
  "solana-sdk-ids",
  "solana-sha256-hasher",
  "solana-signature",
@@ -8501,7 +8499,6 @@ dependencies = [
  "solana-rpc-client",
  "solana-runtime",
  "solana-sanitize",
- "solana-sdk",
  "solana-serde-varint",
  "solana-sha256-hasher",
  "solana-short-vec",
@@ -11375,7 +11372,6 @@ dependencies = [
  "solana-pubkey",
  "solana-rpc-client",
  "solana-runtime",
- "solana-sdk",
  "solana-signer",
  "solana-streamer",
  "solana-system-interface",

cli/Cargo.toml

@@ -98,7 +98,6 @@ solana-faucet = { workspace = true }
 solana-nonce-account = { workspace = true }
 solana-presigner = { workspace = true }
 solana-rpc = { workspace = true }
-solana-sdk = { workspace = true, default-features = false }
 solana-sha256-hasher = { workspace = true }
 solana-streamer = { workspace = true }
 solana-test-validator = { workspace = true }

cli/src/cluster_query.rs

@@ -2435,12 +2435,4 @@ mod tests {
             }
         );
     }
-
-    #[test]
-    fn check_default_rpc_port_inline() {
-        assert_eq!(
-            DEFAULT_RPC_PORT_STR,
-            solana_sdk::rpc_port::DEFAULT_RPC_PORT_STR
-        )
-    }
 }

gossip/Cargo.toml

@@ -86,7 +86,6 @@ serial_test = { workspace = true }
 solana-net-utils = { workspace = true, features = ["dev-context-only-utils"] }
 solana-perf = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
-solana-sdk = { workspace = true }
 solana-system-transaction = { workspace = true }
 solana-vote-interface = { workspace = true }
 static_assertions = { workspace = true }
@@ -100,7 +99,6 @@ frozen-abi = [
     "solana-ledger/frozen-abi",
     "solana-perf/frozen-abi",
     "solana-runtime/frozen-abi",
-    "solana-sdk/frozen-abi",
     "solana-short-vec/frozen-abi",
     "solana-version/frozen-abi",
     "solana-vote/frozen-abi",

gossip/src/contact_info.rs

@@ -18,16 +18,8 @@ use {
     thiserror::Error,
 };
 
-// inline consts to avoid solana-sdk dep
 const DEFAULT_RPC_PORT: u16 = 8899;
 const DEFAULT_RPC_PUBSUB_PORT: u16 = 8900;
-#[cfg(test)]
-static_assertions::const_assert_eq!(DEFAULT_RPC_PORT, solana_sdk::rpc_port::DEFAULT_RPC_PORT);
-#[cfg(test)]
-static_assertions::const_assert_eq!(
-    DEFAULT_RPC_PUBSUB_PORT,
-    solana_sdk::rpc_port::DEFAULT_RPC_PUBSUB_PORT
-);
 
 pub const SOCKET_ADDR_UNSPECIFIED: SocketAddr =
     SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), /*port:*/ 0u16);

programs/sbf/Cargo.lock

@@ -201,7 +201,6 @@ dependencies = [
  "solana-rpc-client",
  "solana-rpc-client-api",
  "solana-runtime",
- "solana-sdk",
  "solana-sdk-ids",
  "solana-send-transaction-service",
  "solana-signer",

rpc/src/rpc.rs

@@ -4548,7 +4548,6 @@ pub mod tests {
             commitment::{BlockCommitment, CommitmentSlots},
             non_circulating_supply::non_circulating_accounts,
         },
-        solana_sdk::rpc_port,
         solana_send_transaction_service::{
             tpu_info::NullTpuInfo,
             transaction_client::{ConnectionCacheClient, TpuClientNextClient},
@@ -5169,8 +5168,8 @@ pub mod tests {
             "tpuForwardsQuic": "127.0.0.1:8010",
             "tpuVote": "127.0.0.1:8005",
             "serveRepair": "127.0.0.1:8008",
-            "rpc": format!("127.0.0.1:{}", rpc_port::DEFAULT_RPC_PORT),
-            "pubsub": format!("127.0.0.1:{}", rpc_port::DEFAULT_RPC_PUBSUB_PORT),
+            "rpc": format!("127.0.0.1:8899"),
+            "pubsub": format!("127.0.0.1:8900"),
             "version": format!("{version}"),
             "featureSet": version.feature_set,
         }, {
@@ -5184,8 +5183,8 @@ pub mod tests {
             "tpuForwardsQuic": "127.0.0.1:1245",
             "tpuVote": "127.0.0.1:1241",
             "serveRepair": "127.0.0.1:1242",
-            "rpc": format!("127.0.0.1:{}", rpc_port::DEFAULT_RPC_PORT),
-            "pubsub": format!("127.0.0.1:{}", rpc_port::DEFAULT_RPC_PUBSUB_PORT),
+            "rpc": format!("127.0.0.1:8899"),
+            "pubsub": format!("127.0.0.1:8900"),
             "version": format!("{version}"),
             "featureSet": version.feature_set,
         }]);

transaction-dos/Cargo.toml

@@ -30,7 +30,6 @@ solana-packet = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-runtime = { workspace = true }
-solana-sdk = { workspace = true, default-features = false }
 solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
 solana-system-interface = { workspace = true }

transaction-dos/src/main.rs

@@ -20,7 +20,6 @@ use {
     solana_packet::PACKET_DATA_SIZE,
     solana_pubkey::Pubkey,
     solana_rpc_client::rpc_client::RpcClient,
-    solana_sdk::rpc_port::DEFAULT_RPC_PORT,
     solana_signer::Signer,
     solana_streamer::socket::SocketAddrSpace,
     solana_system_interface::instruction as system_instruction,
@@ -547,7 +546,7 @@ fn main() {
         .get_matches();
 
     let skip_gossip = !matches.is_present("check_gossip");
-    let port = if skip_gossip { DEFAULT_RPC_PORT } else { 8001 };
+    let port = if skip_gossip { 8899 } else { 8001 };
     let mut entrypoint_addr = SocketAddr::from((Ipv4Addr::LOCALHOST, port));
     if let Some(addr) = matches.value_of("entrypoint") {
         entrypoint_addr = solana_net_utils::parse_host_port(addr).unwrap_or_else(|e| {

validator/Cargo.toml

@@ -66,7 +66,6 @@ solana-rpc = { workspace = true }
 solana-rpc-client = { workspace = true }
 solana-rpc-client-api = { workspace = true }
 solana-runtime = { workspace = true }
-solana-sdk = { version = "=2.2.2", default-features = false }
 solana-sdk-ids = { workspace = true }
 solana-send-transaction-service = { workspace = true }
 solana-signer = { workspace = true }

validator/src/cli.rs

@@ -35,7 +35,6 @@ use {
             DEFAULT_MAX_INCREMENTAL_SNAPSHOT_ARCHIVES_TO_RETAIN,
         },
     },
-    solana_sdk::rpc_port,
     solana_send_transaction_service::send_transaction_service::{self},
     solana_streamer::quic::{
         DEFAULT_MAX_CONNECTIONS_PER_IPADDR_PER_MINUTE, DEFAULT_MAX_QUIC_CONNECTIONS_PER_PEER,
@@ -1038,7 +1037,7 @@ pub struct DefaultTestArgs {
 impl DefaultTestArgs {
     pub fn new() -> Self {
         DefaultTestArgs {
-            rpc_port: rpc_port::DEFAULT_RPC_PORT.to_string(),
+            rpc_port: 8899.to_string(),
             faucet_port: FAUCET_PORT.to_string(),
             /* 10,000 was derived empirically by watching the size
              * of the rocksdb/ directory self-limit itself to the