Resolve Merge Conflicts

deepanshu-iiitu · deepanshu-iiitu · commit 8efab329d7fd · 2024-05-02T16:40:05.000+05:30
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/analytics/Cargo.toml b/crates/analytics/Cargo.toml
@@ -26,7 +26,7 @@ router_env = { version = "0.1.0", path = "../router_env", features = [
 diesel_models = { version = "0.1.0", path = "../diesel_models", features = [
     "kv_store",
 ] }
-data_models = { version = "0.1.0", path = "../data_models", default-features = false }
+hyperswitch_domain_models = { version = "0.1.0", path = "../hyperswitch_domain_models", default-features = false }
 
 #Third Party dependencies
 actix-web = "4.5.1"
diff --git a/crates/analytics/src/opensearch.rs b/crates/analytics/src/opensearch.rs
@@ -4,8 +4,8 @@ use api_models::{
 };
 use aws_config::{self, meta::region::RegionProviderChain, Region};
 use common_utils::errors::{CustomResult, ErrorSwitch};
-use data_models::errors::{StorageError, StorageResult};
 use error_stack::ResultExt;
+use hyperswitch_domain_models::errors::{StorageError, StorageResult};
 use opensearch::{
     auth::Credentials,
     cert::CertificateValidation,
