Skip to content

Commit

Permalink
fix: rebase cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nanderstabel committed Oct 18, 2023
1 parent c5a747e commit f704cc2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
1 change: 0 additions & 1 deletion src-tauri/src/state/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ pub struct Profile {
pub primary_did: String,
}

#[serde(default)]
#[derive(Clone, Serialize, Debug, Deserialize, TS, PartialEq, Default)]
#[ts(export)]
#[serde(default)]
Expand Down
1 change: 0 additions & 1 deletion src-tauri/src/state/reducers/authorization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use oid4vci::credential_format_profiles::{
w3c_verifiable_credentials::jwt_vc_json::JwtVcJson, Credential, CredentialFormats,
};
use oid4vp::{evaluate_input, OID4VPUserClaims, OID4VP};
use serde::Deserialize;
use siopv2::SIOPv2;
use uuid::Uuid;

Expand Down
5 changes: 3 additions & 2 deletions src-tauri/tests/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ mod tests {
&& fifth.as_rule() == Rule::ident_comb =>
{
let mut first = first.into_inner().next().unwrap().into_inner();
let (ident, path) = match (first.next(), first.next(), first.next()) {
let (_ident, path) = match (first.next(), first.next(), first.next()) {
(Some(ident), Some(path), None) => {
let path = path.into_inner().nth(0).unwrap().as_str();
idents.insert(ident.as_str(), path);
Expand All @@ -128,7 +128,8 @@ mod tests {
.as_str();

let mut fifth = fifth.into_inner().next().unwrap().into_inner();
let (ident2, path2) = match (fifth.next(), fifth.next(), fifth.next()) {
let (_ident2, path2) = match (fifth.next(), fifth.next(), fifth.next())
{
(Some(ident), Some(path), None) => {
let path = path.into_inner().nth(0).unwrap().as_str();
idents.insert(ident.as_str(), path);
Expand Down
10 changes: 2 additions & 8 deletions src-tauri/tests/tests/qr_code_scanned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@ use identity_wallet::{
state::{actions::Action, AppState, Profile},
verifiable_credential_record::VerifiableCredentialRecord,
};
use jsonwebtoken::{Algorithm, Header};
use oid4vc_core::{jwt, Subject};
use oid4vc_manager::methods::key_method::KeySubject;
use oid4vci::credential_format_profiles::{Credential, CredentialFormats, Parameters, WithCredential, WithParameters};
use oid4vci::credential_offer::{CredentialOffer, CredentialsObject, Grants, PreAuthorizedCode};
use oid4vci::{
credential_format_profiles::w3c_verifiable_credentials::jwt_vc_json::{self, JwtVcJson},
VerifiableCredentialJwt,
use oid4vci::credential_format_profiles::{
w3c_verifiable_credentials::jwt_vc_json::JwtVcJson, Credential, CredentialFormats, WithCredential,
};
use serde_json::json;
use std::sync::Mutex;
Expand Down

0 comments on commit f704cc2

Please sign in to comment.