Fixed rebase errors

Signed-off-by: artem.ivanov <artem.ivanov@dsr-corporation.com>

src/data_types/w3c/credential_proof.rs

@@ -7,7 +7,6 @@ use anoncreds_clsignatures::{
     SignatureCorrectnessProofBytesProxy, Witness, WitnessBytesProxy,
 };
 use serde::Serialize;
-use serde_json::Value;
 
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/services/w3c/credential_conversion.rs

@@ -258,7 +258,6 @@ mod tests {
         AttributeNames, CredentialDefinitionConfig, CredentialValues, MakeCredentialValues,
         SignatureType,
     };
-    use crate::utils::encoded_object::EncodedObject;
     use crate::{issuer, ErrorKind};
     use anoncreds_clsignatures::{
         CredentialSignature as CLCredentialSignature,

src/services/w3c/issuer.rs

@@ -117,7 +117,7 @@ pub fn create_credential(
         rev_reg,
         witness,
     );
-    let proof = CredentialSignatureProof::new(signature);
+    let proof = CredentialSignatureProof::new(signature)?;
 
     let mut credential = W3CCredential::new();
     credential.set_issuer(cred_def.issuer_id.clone());

src/services/w3c/prover.rs

@@ -17,7 +17,6 @@ use crate::data_types::w3c::presentation_proof::{
     PredicateAttribute, PresentationProof, PresentationProofValue,
 };
 use crate::prover::{CLProofBuilder, _process_credential};
-use crate::utils::encoded_object::EncodedObject;
 use std::collections::HashMap;
 
 /// Process an incoming credential in W3C form as received from the issuer.
@@ -129,7 +128,7 @@ pub fn process_credential(
         signature.rev_reg,
         signature.witness,
     )
-    .encode();
+    .encode()?;
 
     trace!("process_w3c_credential <<< ");
 
@@ -187,7 +186,7 @@ pub fn create_presentation(
 
     let presentation_proof_value = PresentationProofValue::new(cl_proof.aggregated_proof);
     let presentation_proof =
-        PresentationProof::new(presentation_proof_value, pres_req.nonce.to_string());
+        PresentationProof::new(presentation_proof_value, pres_req.nonce.to_string())?;
 
     let mut presentation = W3CPresentation::new();
     presentation.set_proof(presentation_proof);
@@ -198,7 +197,7 @@ pub fn create_presentation(
         let mapping = build_mapping(pres_req, present)?;
         let credential_subject = build_credential_subject(pres_req, present)?;
         let proof_value = CredentialPresentationProofValue::new(sub_proof);
-        let proof = CredentialPresentationProof::new(proof_value, mapping, present.timestamp);
+        let proof = CredentialPresentationProof::new(proof_value, mapping, present.timestamp)?;
         let verifiable_credential = W3CCredential {
             credential_subject,
             proof: OneOrMany::One(CredentialProof::AnonCredsCredentialPresentationProof(proof)),