Skip to content

Commit e2a6579

Browse files
committed
refactor: split "transport" module out of "login_param"
`login_param` module is now for user-visible entered login parameters, while the `transport` module contains structures for internal representation of connection candidate list created during transport configuration.
1 parent 7f05914 commit e2a6579

File tree

11 files changed

+930
-887
lines changed

11 files changed

+930
-887
lines changed

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ use crate::configure::EnteredLoginParam;
1717
use crate::context::Context;
1818
use crate::events::EventType;
1919
use crate::log::{LogExt, info};
20-
use crate::login_param::ConfiguredLoginParam;
2120
use crate::mimefactory::RECOMMENDED_FILE_SIZE;
2221
use crate::provider::{Provider, get_provider_by_id};
2322
use crate::sync::{self, Sync::*, SyncData};
2423
use crate::tools::get_abs_path;
24+
use crate::transport::ConfiguredLoginParam;
2525
use crate::{constants, stats};
2626

2727
/// The available configuration keys.

src/configure.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,20 @@ use crate::constants::NON_ALPHANUMERIC_WITHOUT_DOT;
2828
use crate::context::Context;
2929
use crate::imap::Imap;
3030
use crate::log::{LogExt, info, warn};
31+
use crate::login_param::EnteredCertificateChecks;
3132
pub use crate::login_param::EnteredLoginParam;
32-
use crate::login_param::{
33-
ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
34-
ConnectionCandidate, EnteredCertificateChecks, ProxyConfig,
35-
};
3633
use crate::message::Message;
34+
use crate::net::proxy::ProxyConfig;
3735
use crate::oauth2::get_oauth2_addr;
3836
use crate::provider::{Protocol, Provider, Socket, UsernamePattern};
3937
use crate::qr::{login_param_from_account_qr, login_param_from_login_qr};
4038
use crate::smtp::Smtp;
4139
use crate::sync::Sync::*;
4240
use crate::tools::time;
41+
use crate::transport::{
42+
ConfiguredCertificateChecks, ConfiguredLoginParam, ConfiguredServerLoginParam,
43+
ConnectionCandidate,
44+
};
4345
use crate::{EventType, stock_str};
4446
use crate::{chat, provider};
4547
use deltachat_contact_tools::addr_cmp;

src/context.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::imap::{FolderMeaning, Imap, ServerMetadata};
2323
use crate::key::self_fingerprint;
2424
use crate::log::{info, warn};
2525
use crate::logged_debug_assert;
26-
use crate::login_param::{ConfiguredLoginParam, EnteredLoginParam};
26+
use crate::login_param::EnteredLoginParam;
2727
use crate::message::{self, MessageState, MsgId};
2828
use crate::net::tls::TlsSessionStore;
2929
use crate::peer_channels::Iroh;
@@ -34,6 +34,7 @@ use crate::sql::Sql;
3434
use crate::stock_str::StockStrings;
3535
use crate::timesmearing::SmearedTimestamp;
3636
use crate::tools::{self, duration_to_str, time, time_elapsed};
37+
use crate::transport::ConfiguredLoginParam;
3738
use crate::{chatlist_events, stats};
3839

3940
/// Builder for the [`Context`].

src/imap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ use crate::context::Context;
3333
use crate::events::EventType;
3434
use crate::headerdef::{HeaderDef, HeaderDefMap};
3535
use crate::log::{LogExt, error, info, warn};
36-
use crate::login_param::{
37-
ConfiguredLoginParam, ConfiguredServerLoginParam, prioritize_server_login_params,
38-
};
3936
use crate::message::{self, Message, MessageState, MessengerMessage, MsgId};
4037
use crate::mimeparser;
4138
use crate::net::proxy::ProxyConfig;
@@ -48,6 +45,9 @@ use crate::receive_imf::{
4845
use crate::scheduler::connectivity::ConnectivityStore;
4946
use crate::stock_str;
5047
use crate::tools::{self, create_id, duration_to_str, time};
48+
use crate::transport::{
49+
ConfiguredLoginParam, ConfiguredServerLoginParam, prioritize_server_login_params,
50+
};
5151

5252
pub(crate) mod capabilities;
5353
mod client;

src/imap/client.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ use tokio::io::BufWriter;
99
use super::capabilities::Capabilities;
1010
use crate::context::Context;
1111
use crate::log::{LoggingStream, info, warn};
12-
use crate::login_param::{ConnectionCandidate, ConnectionSecurity};
1312
use crate::net::dns::{lookup_host_with_cache, update_connect_timestamp};
1413
use crate::net::proxy::ProxyConfig;
1514
use crate::net::session::SessionStream;
1615
use crate::net::tls::wrap_tls;
1716
use crate::net::{connect_tcp_inner, run_connection_attempts, update_connection_history};
1817
use crate::tools::time;
18+
use crate::transport::ConnectionCandidate;
19+
use crate::transport::ConnectionSecurity;
1920

2021
#[derive(Debug)]
2122
pub(crate) struct Client {

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ pub mod stock_str;
8989
mod sync;
9090
mod timesmearing;
9191
mod token;
92+
mod transport;
9293
mod update_helper;
9394
pub mod webxdc;
9495
#[macro_use]

0 commit comments

Comments
 (0)