From fe8b901bd398802f7a7b4c3c0a1302bf285dde1d Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 11 Sep 2023 23:21:19 -0500 Subject: [PATCH] keyfork-seed: make bin into lib with bin --- keyfork-seed/src/lib.rs | 37 +++++++++++++++++++++++++++++++++++++ keyfork-seed/src/main.rs | 37 ++----------------------------------- 2 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 keyfork-seed/src/lib.rs diff --git a/keyfork-seed/src/lib.rs b/keyfork-seed/src/lib.rs new file mode 100644 index 0000000..41a9b22 --- /dev/null +++ b/keyfork-seed/src/lib.rs @@ -0,0 +1,37 @@ +use std::path::PathBuf; +use keyfork_frame::{EncodeError, DecodeError}; + +pub mod cli; +pub mod socket; +pub mod client; + +pub use client::Client; + +#[derive(Debug, thiserror::Error)] +pub enum Error { + #[error("The first argument to the command should be a derivation path")] + Args, + + #[error("The given path was incorrectly formatted: {0}")] + ArgsFormat(#[from] keyfork_derive_util::path::Error), + + #[error("Neither KEYFORK_SOCKET_PATH nor XDG_RUNTIME_DIR were set")] + EnvVarsNotFound, + + #[error("Socket was unable to connect to {1}: {0}")] + Connect(std::io::Error, PathBuf), + + #[error("Could not write to or from the socket: {0}")] + Io(#[from] std::io::Error), + + #[error("Could not perform bincode transformation: {0}")] + Bincode(#[from] Box), + + #[error("Could not perform frame transformation: {0}")] + FrameEnc(#[from] EncodeError), + + #[error("Could not perform frame transformation: {0}")] + FrameDec(#[from] DecodeError), +} + +pub type Result = std::result::Result; diff --git a/keyfork-seed/src/main.rs b/keyfork-seed/src/main.rs index 442011b..185112d 100644 --- a/keyfork-seed/src/main.rs +++ b/keyfork-seed/src/main.rs @@ -1,42 +1,9 @@ -use keyfork_derive_util::{request::*, DerivationPath}; -use keyfork_frame::*; -use std::path::PathBuf; - -mod cli; -mod socket; -mod client; +use keyfork_derive_util::{request::{DerivationRequest, DerivationAlgorithm}, DerivationPath}; #[cfg(test)] mod tests; -#[derive(Debug, thiserror::Error)] -pub enum Error { - #[error("The first argument to the command should be a derivation path")] - Args, - - #[error("The given path was incorrectly formatted: {0}")] - ArgsFormat(#[from] keyfork_derive_util::path::Error), - - #[error("Neither KEYFORK_SOCKET_PATH nor XDG_RUNTIME_DIR were set")] - EnvVarsNotFound, - - #[error("Socket was unable to connect to {1}: {0}")] - Connect(std::io::Error, PathBuf), - - #[error("Could not write to or from the socket: {0}")] - Io(#[from] std::io::Error), - - #[error("Could not perform bincode transformation: {0}")] - Bincode(#[from] Box), - - #[error("Could not perform frame transformation: {0}")] - FrameEnc(#[from] EncodeError), - - #[error("Could not perform frame transformation: {0}")] - FrameDec(#[from] DecodeError), -} - -pub type Result = std::result::Result; +use keyfork_seed::*; fn main() -> Result<()> { let args = cli::get_args();