address comments by Kirill Lykov

anza-xyz · Dec 2, 2024 · 9e69118 · 9e69118
1 parent 56af8a2
commit 9e69118
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,7 +87,6 @@ members = [
     "programs/zk-token-proof-tests",
     "pubsub-client",
     "quic-client",
-    "tls-utils",
     "rayon-threadlimit",
     "rbpf-cli",
     "remote-wallet",
@@ -187,6 +186,7 @@ members = [
     "test-validator",
     "thin-client",
     "timings",
+    "tls-utils",
     "tokens",
     "tps-client",
     "tpu-client",
@@ -493,7 +493,6 @@ solana-metrics = { path = "metrics", version = "=2.2.0" }
 solana-msg = { path = "sdk/msg", version = "=2.2.0" }
 solana-native-token = { path = "sdk/native-token", version = "=2.2.0" }
 solana-net-utils = { path = "net-utils", version = "=2.2.0" }
-solana-tls-utils = { path = "tls-utils", version = "=2.2.0" }
 solana-nohash-hasher = "0.2.1"
 solana-nonce = { path = "sdk/nonce", version = "=2.2.0" }
 solana-notifier = { path = "notifier", version = "=2.2.0" }
@@ -523,8 +522,8 @@ solana-rent = { path = "sdk/rent", version = "=2.2.0", default-features = false
 solana-rent-debits = { path = "sdk/rent-debits", version = "=2.2.0" }
 solana-reserved-account-keys = { path = "sdk/reserved-account-keys", version = "=2.2.0", default-features = false }
 solana-reward-info = { path = "sdk/reward-info", version = "=2.2.0" }
-solana-secp256r1-program = { path = "sdk/secp256r1-program", version = "=2.2.0", default-features = false }
 solana-sanitize = { path = "sdk/sanitize", version = "=2.2.0" }
+solana-secp256r1-program = { path = "sdk/secp256r1-program", version = "=2.2.0", default-features = false }
 solana-seed-derivable = { path = "sdk/seed-derivable", version = "=2.2.0" }
 solana-seed-phrase = { path = "sdk/seed-phrase", version = "=2.2.0" }
 solana-serde = { path = "sdk/serde", version = "=2.2.0" }
@@ -537,6 +536,7 @@ solana-slot-hashes = { path = "sdk/slot-hashes", version = "=2.2.0" }
 solana-slot-history = { path = "sdk/slot-history", version = "=2.2.0" }
 solana-time-utils = { path = "sdk/time-utils", version = "=2.2.0" }
 solana-timings = { path = "timings", version = "=2.2.0" }
+solana-tls-utils = { path = "tls-utils", version = "=2.2.0" }
 solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.2.0" }
 solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=2.2.0" }
 solana-rpc = { path = "rpc", version = "=2.2.0" }

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -83,9 +83,9 @@ solana-streamer = { workspace = true }
 solana-svm = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-timings = { workspace = true }
+solana-tls-utils = { workspace = true }
 solana-tpu-client = { workspace = true }
 solana-transaction-status = { workspace = true }
-solana-tls-utils = { workspace = true }
 solana-turbine = { workspace = true }
 solana-unified-scheduler-pool = { workspace = true }
 solana-version = { workspace = true }

diff --git a/quic-client/Cargo.toml b/quic-client/Cargo.toml
@@ -33,7 +33,6 @@ solana-tls-utils = { workspace = true }
 solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-
 [dev-dependencies]
 crossbeam-channel = { workspace = true }
 solana-logger = { workspace = true }

diff --git a/tls-utils/Cargo.toml b/tls-utils/Cargo.toml
@@ -11,14 +11,13 @@ license.workspace = true
 edition.workspace = true
 
 [dependencies]
-solana-sdk = { workspace = true }
 
 rustls = { workspace = true, features=["ring"] }
-x509-parser = { workspace = true }
 solana-keypair = { workspace = true }
-solana-signer = { workspace = true }
 solana-pubkey = { workspace = true }
-
+solana-sdk = { workspace = true }
+solana-signer = { workspace = true }
+x509-parser = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/tls-utils/README b/tls-utils/README
@@ -1 +1 @@
-A collection of utility functions and structures needed to bridge the conceptual gap between conventional TLS security model in protocols like QUIC and what Solana does
+A collection of utility functions and structures needed to bridge the conceptual gap between conventional TLS security model in protocols like QUIC and what Solana does.
diff --git a/tls-utils/src/lib.rs b/tls-utils/src/lib.rs
@@ -1,5 +1,5 @@
 //! Collection of TLS related code fragments that end up popping up everywhere where quic is used.
-//! Aggregated here to avoid bugs due to conflicting implementations of the same functionality
+//! Aggregated here to avoid bugs due to conflicting implementations of the same functionality.
 
 mod tls_certificates;
 pub use tls_certificates::*;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		A collection of utility functions and structures needed to bridge the conceptual gap between conventional TLS security model in protocols like QUIC and what Solana does
		A collection of utility functions and structures needed to bridge the conceptual gap between conventional TLS security model in protocols like QUIC and what Solana does.