Skip to content

Commit 8af6f5b

Browse files
committed
chore(transport/tcp-tls): small types refactor
1 parent 900e075 commit 8af6f5b

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

msg-socket/tests/it/reqrep.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ async fn reqrep_works() {
8484
async fn reqrep_tls_works() {
8585
let _ = tracing_subscriber::fmt::try_init();
8686

87-
let server_config =
88-
tcp_tls::config::Server { ssl_acceptor: helpers::default_acceptor_builder().build() };
87+
let server_config = tcp_tls::config::Server::new(helpers::default_acceptor_builder().build());
8988
let tcp_tls_server = TcpTls::new_server(server_config);
9089
let mut rep = RepSocket::new(tcp_tls_server);
9190

@@ -120,7 +119,7 @@ async fn reqrep_mutual_tls_works() {
120119
acceptor_builder.set_verify(
121120
openssl::ssl::SslVerifyMode::PEER | openssl::ssl::SslVerifyMode::FAIL_IF_NO_PEER_CERT,
122121
);
123-
let server_config = tcp_tls::config::Server { ssl_acceptor: acceptor_builder.build() };
122+
let server_config = tcp_tls::config::Server::new(acceptor_builder.build());
124123
let tcp_tls_server = TcpTls::new_server(server_config);
125124
let mut rep = RepSocket::new(tcp_tls_server);
126125

msg-transport/src/tcp_tls/config.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ pub struct Server {
3030
pub ssl_acceptor: SslAcceptor,
3131
}
3232

33+
impl Server {
34+
pub fn new(ssl_acceptor: SslAcceptor) -> Self {
35+
Self { ssl_acceptor }
36+
}
37+
}
38+
3339
impl fmt::Debug for Server {
3440
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
3541
f.debug_struct("Server").field("ssl_acceptor", &"SslAcceptor").finish()

msg-transport/src/tcp_tls/mod.rs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::{Acceptor, PeerAddress, Transport, TransportExt};
1919

2020
pub mod config;
2121

22-
/// An invalid operation, due to using as a server or viceversa.
22+
/// An invalid operation, due to using a client as a server or viceversa.
2323
#[derive(Debug, Clone, Copy, thiserror::Error)]
2424
pub enum InvalidOperation {
2525
#[error("tried to bind as a client")]
@@ -48,9 +48,15 @@ pub enum Error {
4848
}
4949

5050
/// A TCP-TLS client.
51-
#[derive(Debug, Clone, From, Deref, DerefMut)]
51+
#[derive(Debug, Clone, Deref, DerefMut)]
5252
pub struct Client(config::Client);
5353

54+
impl Client {
55+
pub fn new(config: config::Client) -> Self {
56+
Self(config)
57+
}
58+
}
59+
5460
/// A TCP-TLS server.
5561
pub struct Server {
5662
/// The underlying TCP listener.
@@ -59,6 +65,12 @@ pub struct Server {
5965
acceptor: Arc<SslAcceptor>,
6066
}
6167

68+
impl Server {
69+
pub fn new(acceptor: SslAcceptor) -> Self {
70+
Self { listener: None, acceptor: Arc::new(acceptor) }
71+
}
72+
}
73+
6274
impl fmt::Debug for Server {
6375
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
6476
f.debug_struct("Server")
@@ -78,12 +90,12 @@ pub enum TcpTls {
7890
impl TcpTls {
7991
/// Create a new instance of the transport with client configuration.
8092
pub fn new_client(config: config::Client) -> Self {
81-
TcpTls::Client(config.into())
93+
TcpTls::Client(Client::new(config))
8294
}
8395

8496
/// Create a new instance of the transport with server configuration.
8597
pub fn new_server(config: config::Server) -> Self {
86-
TcpTls::Server(Server { listener: None, acceptor: Arc::new(config.ssl_acceptor) })
98+
TcpTls::Server(Server::new(config.ssl_acceptor))
8799
}
88100

89101
pub fn as_client(&self) -> Option<&Client> {

0 commit comments

Comments
 (0)