From e2953ba1a5cbd8c7c79987ca03fc2450aa3cf96a Mon Sep 17 00:00:00 2001
From: Enrico Marconi <enrico.marconi@hotmail.it>
Date: Thu, 30 Nov 2023 12:34:40 +0100
Subject: [PATCH] Fix credential crate's features shenanigans

---
 identity_credential/src/credential/linked_domain_service.rs     | 2 +-
 .../src/domain_linkage/domain_linkage_configuration.rs          | 2 +-
 .../src/domain_linkage/domain_linkage_credential_builder.rs     | 2 +-
 .../src/domain_linkage/domain_linkage_validator.rs              | 2 +-
 identity_credential/src/domain_linkage/mod.rs                   | 1 -
 identity_credential/src/lib.rs                                  | 1 +
 identity_credential/src/{domain_linkage => }/utils.rs           | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename identity_credential/src/{domain_linkage => }/utils.rs (100%)

diff --git a/identity_credential/src/credential/linked_domain_service.rs b/identity_credential/src/credential/linked_domain_service.rs
index b976825512..c6efbae255 100644
--- a/identity_credential/src/credential/linked_domain_service.rs
+++ b/identity_credential/src/credential/linked_domain_service.rs
@@ -10,8 +10,8 @@ use identity_document::service::ServiceBuilder;
 use identity_document::service::ServiceEndpoint;
 use indexmap::map::IndexMap;
 
-use crate::domain_linkage::utils::url_only_includes_origin;
 use crate::error::Result;
+use crate::utils::url_only_includes_origin;
 use crate::Error;
 use crate::Error::DomainLinkageError;
 
diff --git a/identity_credential/src/domain_linkage/domain_linkage_configuration.rs b/identity_credential/src/domain_linkage/domain_linkage_configuration.rs
index 51d54756e2..667c70276d 100644
--- a/identity_credential/src/domain_linkage/domain_linkage_configuration.rs
+++ b/identity_credential/src/domain_linkage/domain_linkage_configuration.rs
@@ -109,9 +109,9 @@ impl DomainLinkageConfiguration {
 
 #[cfg(feature = "domain-linkage-fetch")]
 mod __fetch_configuration {
-  use crate::domain_linkage::utils::url_only_includes_origin;
   use crate::domain_linkage::DomainLinkageConfiguration;
   use crate::error::Result;
+  use crate::utils::url_only_includes_origin;
   use crate::Error::DomainLinkageError;
   use futures::StreamExt;
   use identity_core::common::Url;
diff --git a/identity_credential/src/domain_linkage/domain_linkage_credential_builder.rs b/identity_credential/src/domain_linkage/domain_linkage_credential_builder.rs
index 518d79956a..726e9b0cb6 100644
--- a/identity_credential/src/domain_linkage/domain_linkage_credential_builder.rs
+++ b/identity_credential/src/domain_linkage/domain_linkage_credential_builder.rs
@@ -14,7 +14,7 @@ use identity_core::common::Url;
 use identity_did::CoreDID;
 use identity_did::DID;
 
-use super::utils::url_only_includes_origin;
+use crate::utils::url_only_includes_origin;
 
 /// Convenient builder to create a spec compliant Domain Linkage Credential.
 ///
diff --git a/identity_credential/src/domain_linkage/domain_linkage_validator.rs b/identity_credential/src/domain_linkage/domain_linkage_validator.rs
index 169701b9fe..24969c1c65 100644
--- a/identity_credential/src/domain_linkage/domain_linkage_validator.rs
+++ b/identity_credential/src/domain_linkage/domain_linkage_validator.rs
@@ -17,8 +17,8 @@ use identity_verification::jws::JwsVerifier;
 
 use crate::validator::DecodedJwtCredential;
 
-use super::utils::url_only_includes_origin;
 use super::DomainLinkageValidationResult;
+use crate::utils::url_only_includes_origin;
 
 /// A validator for a Domain Linkage Configuration and Credentials.
 
diff --git a/identity_credential/src/domain_linkage/mod.rs b/identity_credential/src/domain_linkage/mod.rs
index 6451b938fe..7595641990 100644
--- a/identity_credential/src/domain_linkage/mod.rs
+++ b/identity_credential/src/domain_linkage/mod.rs
@@ -7,7 +7,6 @@ mod domain_linkage_configuration;
 mod domain_linkage_credential_builder;
 mod domain_linkage_validator;
 mod error;
-pub(crate) mod utils;
 
 pub use self::domain_linkage_configuration::*;
 pub use self::domain_linkage_credential_builder::*;
diff --git a/identity_credential/src/lib.rs b/identity_credential/src/lib.rs
index 79f85044a8..1901dd0ca5 100644
--- a/identity_credential/src/lib.rs
+++ b/identity_credential/src/lib.rs
@@ -23,6 +23,7 @@ pub mod error;
 pub mod presentation;
 #[cfg(feature = "revocation-bitmap")]
 pub mod revocation;
+mod utils;
 #[cfg(feature = "validator")]
 pub mod validator;
 
diff --git a/identity_credential/src/domain_linkage/utils.rs b/identity_credential/src/utils.rs
similarity index 100%
rename from identity_credential/src/domain_linkage/utils.rs
rename to identity_credential/src/utils.rs