Fix formatting & clippy warnings.

spruceid · Jun 27, 2024 · 4658715 · 4658715
1 parent 626d8ce
commit 4658715
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 35 deletions.
diff --git a/crates/claims/crates/data-integrity/suites/src/suites/w3c/bbs_2023/mod.rs b/crates/claims/crates/data-integrity/suites/src/suites/w3c/bbs_2023/mod.rs
@@ -1,14 +1,12 @@
 //! Data Integrity BBS Cryptosuite 2023 (v1.0) implementation.
 //!
 //! See: <https://www.w3.org/TR/vc-di-bbs/#bbs-2023>
-use ssi_claims_core::DefaultEnvironment;
 use ssi_data_integrity_core::{
     suite::{ConfigurationAlgorithm, ConfigurationError, InputProofOptions},
     CryptosuiteStr, ProofConfiguration, StandardCryptographicSuite, Type, TypeRef,
     UnsupportedProofSuite,
 };
 use ssi_di_sd_primitives::JsonPointerBuf;
-use ssi_json_ld::JsonLdEnvironment;
 use ssi_verification_methods::Multikey;
 
 pub(crate) mod transformation;
@@ -61,10 +59,6 @@ impl TryFrom<Type> for Bbs2023 {
     }
 }
 
-impl DefaultEnvironment for Bbs2023 {
-    type Environment = JsonLdEnvironment;
-}
-
 #[derive(Clone)]
 pub struct Bbs2023InputOptions {
     pub mandatory_pointers: Vec<JsonPointerBuf>,

diff --git a/crates/dids/methods/key/src/lib.rs b/crates/dids/methods/key/src/lib.rs
@@ -110,7 +110,7 @@ impl DIDKey {
 
                         multibase::encode(
                             multibase::Base::Base58Btc,
-                            MultiEncodedBuf::encode(ssi_multicodec::P384_PUB, &pk_bytes)
+                            MultiEncodedBuf::encode_bytes(ssi_multicodec::P384_PUB, &pk_bytes)
                                 .into_bytes(),
                         )
                     }

diff --git a/crates/verification-methods/src/methods/unspecified/eip712_method_2021.rs b/crates/verification-methods/src/methods/unspecified/eip712_method_2021.rs
@@ -111,12 +111,9 @@ impl Eip712Method2021 {
 
         // Check the signing key.
         let jwk = JWK {
-            params: ssi_jwk::Params::EC(
-                ssi_jwk::ECParams::try_from(
-                    &k256::PublicKey::from_sec1_bytes(&recovered_key.to_sec1_bytes()).unwrap(),
-                )
-                .unwrap(),
-            ),
+            params: ssi_jwk::Params::EC(ssi_jwk::ECParams::from(
+                &k256::PublicKey::from_sec1_bytes(&recovered_key.to_sec1_bytes()).unwrap(),
+            )),
             public_key_use: None,
             key_operations: None,
             algorithm: None,

diff --git a/crates/verification-methods/src/methods/w3c/ecdsa_secp_256k1_recovery_method_2020.rs b/crates/verification-methods/src/methods/w3c/ecdsa_secp_256k1_recovery_method_2020.rs
@@ -281,17 +281,7 @@ impl PublicKeyHex {
     }
 
     pub fn to_jwk(&self) -> JWK {
-        JWK {
-            params: ssi_jwk::Params::EC(ssi_jwk::ECParams::try_from(&self.decoded).unwrap()),
-            public_key_use: None,
-            key_operations: None,
-            algorithm: None,
-            key_id: None,
-            x509_url: None,
-            x509_certificate_chain: None,
-            x509_thumbprint_sha1: None,
-            x509_thumbprint_sha256: None,
-        }
+        self.decoded.into()
     }
 }
 

diff --git a/crates/verification-methods/src/methods/w3c/ecdsa_secp_256k1_verification_key_2019.rs b/crates/verification-methods/src/methods/w3c/ecdsa_secp_256k1_verification_key_2019.rs
@@ -248,17 +248,7 @@ impl PublicKeyHex {
     }
 
     pub fn to_jwk(&self) -> JWK {
-        JWK {
-            params: ssi_jwk::Params::EC(ssi_jwk::ECParams::try_from(&self.decoded).unwrap()),
-            public_key_use: None,
-            key_operations: None,
-            algorithm: None,
-            key_id: None,
-            x509_url: None,
-            x509_certificate_chain: None,
-            x509_thumbprint_sha1: None,
-            x509_thumbprint_sha256: None,
-        }
+        self.decoded.into()
     }
 }