diff --git a/keyfork-derive-key/src/cli.rs b/keyfork-derive-key/src/cli.rs index 7c9c112..0382860 100644 --- a/keyfork-derive-key/src/cli.rs +++ b/keyfork-derive-key/src/cli.rs @@ -1,6 +1,6 @@ use crate::client::Client; use clap::Parser; -use keyfork_derive_util::{request::*, DerivationPath}; +use keyfork_derive_util::{request::{DerivationAlgorithm, DerivationRequest, DerivationResponse}, DerivationPath}; #[derive(Parser, Clone, Debug)] pub struct Command { diff --git a/keyfork-derive-key/src/client.rs b/keyfork-derive-key/src/client.rs index 96a6298..298e8f7 100644 --- a/keyfork-derive-key/src/client.rs +++ b/keyfork-derive-key/src/client.rs @@ -1,6 +1,6 @@ use crate::Result; -use keyfork_derive_util::request::*; -use keyfork_frame::*; +use keyfork_derive_util::request::{DerivationRequest, DerivationResponse}; +use keyfork_frame::{try_decode_from, try_encode_to}; use std::os::unix::net::UnixStream; #[derive(Debug)] diff --git a/keyfork-derive-key/src/main.rs b/keyfork-derive-key/src/main.rs index 250c511..9ba8862 100644 --- a/keyfork-derive-key/src/main.rs +++ b/keyfork-derive-key/src/main.rs @@ -3,6 +3,7 @@ use clap::Parser; #[cfg(test)] mod tests; +#[allow(clippy::wildcard_imports)] use keyfork_derive_key::*; fn main() -> Result<()> { diff --git a/keyfork-derive-key/src/socket.rs b/keyfork-derive-key/src/socket.rs index 1ea3e9c..ae9ca17 100644 --- a/keyfork-derive-key/src/socket.rs +++ b/keyfork-derive-key/src/socket.rs @@ -1,6 +1,7 @@ use super::Error; use std::{collections::HashMap, os::unix::net::UnixStream, path::PathBuf}; +#[allow(clippy::module_name_repetitions)] pub fn get_socket() -> Result { let socket_vars = std::env::vars() .filter(|(key, _)| ["XDG_RUNTIME_DIR", "KEYFORKD_SOCKET_PATH"].contains(&key.as_str())) diff --git a/keyfork-derive-util/src/public_key.rs b/keyfork-derive-util/src/public_key.rs index 409c440..0c16b5a 100644 --- a/keyfork-derive-util/src/public_key.rs +++ b/keyfork-derive-util/src/public_key.rs @@ -35,7 +35,7 @@ pub trait PublicKey: Sized { let hash = Sha256::new().chain_update(self.to_bytes()).finalize(); let hash = Ripemd160::new().chain_update(hash).finalize(); // Note: Safety assured by type returned from Ripemd160 - hash[..4].try_into().unwrap() + hash[..4].try_into().expect("Ripemd160 returned too little data") } } @@ -73,8 +73,9 @@ impl PublicKey for k256::PublicKey { */ fn to_bytes(&self) -> PublicKeyBytes { - // Note: Safety assured by type returned from EncodedPoint - self.to_encoded_point(true).as_bytes().try_into().unwrap() + let mut result = [0u8; 33]; + result[..].copy_from_slice(self.to_encoded_point(true).as_bytes()); + result } fn derive_child(&self, other: PrivateKeyBytes) -> Result { diff --git a/keyfork-entropy/src/lib.rs b/keyfork-entropy/src/lib.rs index 465001d..766262c 100644 --- a/keyfork-entropy/src/lib.rs +++ b/keyfork-entropy/src/lib.rs @@ -37,7 +37,7 @@ fn ensure_offline() { .expect("Unable to decode UTF-8 filepath") .split('/') .last() - .unwrap() + .expect("No data in file path") == "lo" { continue; diff --git a/keyfork-mnemonic-from-seed/src/main.rs b/keyfork-mnemonic-from-seed/src/main.rs index 8d08e59..1195c0f 100644 --- a/keyfork-mnemonic-from-seed/src/main.rs +++ b/keyfork-mnemonic-from-seed/src/main.rs @@ -1,3 +1,4 @@ +#[allow(clippy::wildcard_imports)] use keyfork_mnemonic_from_seed::*; fn main() -> Result<(), Box> { diff --git a/keyfork-slip10-test-data/src/lib.rs b/keyfork-slip10-test-data/src/lib.rs index a525098..ecab2cf 100644 --- a/keyfork-slip10-test-data/src/lib.rs +++ b/keyfork-slip10-test-data/src/lib.rs @@ -25,6 +25,7 @@ const ED25519_512: &str = "fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b 9f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542"; // Note: This should never error. +#[allow(clippy::too_many_lines)] pub fn test_data() -> Result>, Box> { // Format: let mut map = HashMap::new(); diff --git a/keyfork/src/main.rs b/keyfork/src/main.rs index e1a7725..e8f5ca3 100644 --- a/keyfork/src/main.rs +++ b/keyfork/src/main.rs @@ -1,3 +1,5 @@ +#![allow(clippy::module_name_repetitions)] + use clap::Parser; mod cli; @@ -5,5 +7,5 @@ mod cli; fn main() { let opts = cli::Keyfork::parse(); - opts.command.handle(&opts).unwrap(); + opts.command.handle(&opts).expect("Unable to handle command"); } diff --git a/keyforkd/src/error.rs b/keyforkd/src/error.rs index 6a8ce6a..229c3d0 100644 --- a/keyforkd/src/error.rs +++ b/keyforkd/src/error.rs @@ -1,7 +1,7 @@ use thiserror::Error; #[derive(Debug, Clone, Error)] -pub enum KeyforkdError { +pub enum Keyforkd { #[error("Neither KEYFORKD_SOCKET_PATH nor XDG_RUNTIME_DIR were set, nowhere to mount socket")] NoSocketPath, } diff --git a/keyforkd/src/lib.rs b/keyforkd/src/lib.rs index 6287970..75b0a5d 100644 --- a/keyforkd/src/lib.rs +++ b/keyforkd/src/lib.rs @@ -13,7 +13,7 @@ pub mod error; pub mod middleware; pub mod server; pub mod service; -pub use error::KeyforkdError; +pub use error::Keyforkd as KeyforkdError; pub use server::UnixServer; pub use service::Keyforkd; diff --git a/keyforkd/src/middleware.rs b/keyforkd/src/middleware.rs index b64726f..2822239 100644 --- a/keyforkd/src/middleware.rs +++ b/keyforkd/src/middleware.rs @@ -19,6 +19,12 @@ impl<'a, Request> BincodeLayer<'a, Request> { } } +impl<'a, Request> Default for BincodeLayer<'a, Request> { + fn default() -> Self { + Self::new() + } +} + impl<'a, S: 'a, Request> Layer for BincodeLayer<'a, Request> { type Service = BincodeService; @@ -137,7 +143,7 @@ mod tests { async fn can_serde_responses() { let content = serialize(&Test::new()).unwrap(); let mut service = ServiceBuilder::new() - .layer(BincodeLayer::::new()) + .layer(BincodeLayer::::default()) .service(App); let result = service .ready()