re-export v2 Credential as CredentialV2

Author: UMR1352

bindings/wasm/identity_wasm/src/credential/credential_v2.rs

@@ -6,8 +6,8 @@ use identity_iota::core::Object;
 use identity_iota::core::OneOrMany;
 use identity_iota::core::Timestamp;
 use identity_iota::core::Url;
-use identity_iota::credential::credential_v2::Credential as CredentialV2;
 use identity_iota::credential::CredentialBuilder;
+use identity_iota::credential::CredentialV2;
 use identity_iota::credential::DomainLinkageCredentialBuilder;
 use identity_iota::credential::Evidence;
 use identity_iota::credential::Issuer;

bindings/wasm/identity_wasm/src/credential/mod.rs

@@ -4,9 +4,9 @@
 #![allow(clippy::module_inception)]
 
 use identity_iota::core::Object;
-use identity_iota::credential::credential_v2::Credential as CredentialV2;
 use identity_iota::credential::Credential;
 use identity_iota::credential::CredentialT;
+use identity_iota::credential::CredentialV2;
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen::JsValue;
 

examples/0_basic/9_vc_v2.rs

@@ -25,8 +25,8 @@ use identity_iota::storage::JwsSignatureOptions;
 use identity_iota::core::json;
 use identity_iota::core::FromJson;
 use identity_iota::core::Url;
-use identity_iota::credential::credential_v2::Credential;
 use identity_iota::credential::CredentialBuilder;
+use identity_iota::credential::CredentialV2;
 use identity_iota::credential::FailFast;
 use identity_iota::credential::Subject;
 use identity_iota::did::DID;
@@ -55,7 +55,7 @@ async fn main() -> anyhow::Result<()> {
   }))?;
 
   // Build credential using subject above and issuer.
-  let credential: Credential = CredentialBuilder::default()
+  let credential: CredentialV2 = CredentialBuilder::default()
     .id(Url::parse("https://example.edu/credentials/3732")?)
     .issuer(Url::parse(issuer_document.id().as_str())?)
     .type_("UniversityDegreeCredential")

identity_credential/src/credential/builder.rs

@@ -7,8 +7,8 @@ use identity_core::common::Timestamp;
 use identity_core::common::Url;
 use identity_core::common::Value;
 
-use crate::credential::credential_v2::Credential as CredentialV2;
 use crate::credential::Credential;
+use crate::credential::CredentialV2;
 use crate::credential::Evidence;
 use crate::credential::Issuer;
 use crate::credential::Policy;

identity_credential/src/credential/mod.rs

@@ -7,8 +7,7 @@
 
 mod builder;
 mod credential;
-/// VC Data Model 2.0 implementation.
-pub mod credential_v2;
+mod credential_v2;
 mod evidence;
 mod issuer;
 #[cfg(feature = "jpt-bbs-plus")]
@@ -57,6 +56,7 @@ pub use self::revocation_bitmap_status::RevocationBitmapStatus;
 pub use self::schema::Schema;
 pub use self::status::Status;
 pub use self::subject::Subject;
+pub use credential_v2::Credential as CredentialV2;
 
 #[cfg(feature = "validator")]
 pub(crate) use self::jwt_serialization::CredentialJwtClaims;

identity_credential/src/domain_linkage/domain_linkage_credential_builder.rs

@@ -1,8 +1,8 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::credential::credential_v2::Credential as CredentialV2;
 use crate::credential::Credential;
+use crate::credential::CredentialV2;
 use crate::credential::Issuer;
 use crate::credential::Subject;
 use crate::domain_linkage::DomainLinkageConfiguration;

identity_credential/src/validator/jwt_credential_validation/decoded_jwt_credential.rs

@@ -1,8 +1,8 @@
 // Copyright 2020-2023 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::credential::credential_v2::Credential as CredentialV2;
 use crate::credential::Credential;
+use crate::credential::CredentialV2;
 use identity_core::common::Object;
 use identity_verification::jose::jws::JwsHeader;
 

identity_credential/src/validator/jwt_credential_validation/jwt_credential_validator.rs

@@ -202,7 +202,7 @@ impl<V: JwsVerifier> JwtCredentialValidator<V> {
     T: ToOwned<Owned = T> + serde::Serialize + serde::de::DeserializeOwned,
     DOC: AsRef<CoreDocument>,
   {
-    Self::verify_signature_with_verifier_v2(&self.0, credential, trusted_issuers, options)
+    Self::verify_signature_with_verifier_v2::<DOC, V, T>(&self.0, credential, trusted_issuers, options)
   }
 
   // This method takes a slice of issuer's instead of a single issuer in order to better accommodate presentation