refactor: more db_client -> db

mozilla-services · Mar 30, 2023 · 61beb2e · 61beb2e
1 parent 5a6a35a
commit 61beb2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/autoconnect/autoconnect-settings/src/app_state.rs b/autoconnect/autoconnect-settings/src/app_state.rs
@@ -15,7 +15,7 @@ use crate::{Settings, ENV_PREFIX};
 #[derive(Clone)]
 pub struct AppState {
     /// Handle to the data storage object
-    pub db_client: Box<dyn DbClient>,
+    pub db: Box<dyn DbClient>,
     pub metrics: Arc<StatsdClient>,
 
     /// Encryption object for the endpoint URL
@@ -59,7 +59,7 @@ impl AppState {
             dsn: settings.db_dsn.clone(),
             db_settings: settings.db_settings.clone(),
         };
-        let db_client = match StorageType::from_dsn(&db_settings.dsn) {
+        let db = match StorageType::from_dsn(&db_settings.dsn) {
             StorageType::DynamoDb => Box::new(DdbClientImpl::new(metrics.clone(), &db_settings)?),
             StorageType::INVALID => panic!("Invalid Storage type. Check {}_DB_DSN.", ENV_PREFIX),
         };
@@ -68,7 +68,7 @@ impl AppState {
         let endpoint_url = settings.endpoint_url();
 
         Ok(Self {
-            db_client,
+            db,
             metrics,
             fernet,
             registry: Arc::new(ClientRegistry::default()),

diff --git a/autoconnect/autoconnect-web/src/client.rs b/autoconnect/autoconnect-web/src/client.rs
@@ -99,7 +99,7 @@ impl Client {
     pub async fn ws_handler(req: HttpRequest, body: Payload) -> Result<HttpResponse> {
         let state = req.app_data::<AppState>().unwrap().clone();
         let client_metrics = state.metrics.clone();
-        let db_client = state.db_client.clone();
+        let db_client = state.db.clone();
         let clients = req.app_data::<ClientChannels>().unwrap().clone();
         let ua_string = if let Some(header) = req.headers().get(actix_web::http::header::USER_AGENT)
         {