Use kairos-crypto in CLI parsing.

cspr-rad · Mar 17, 2024 · 81bc25b · 81bc25b
1 parent 80aace0
commit 81bc25b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kairos-cli/Cargo.toml b/kairos-cli/Cargo.toml
@@ -17,6 +17,7 @@ casper-types = { version = "4.0.1", features = ["std"] } # TODO: Change `std` ->
 clap = { version = "4.4.18", features = ["derive"] }
 hex = "0.4.3"
 thiserror = "1.0.56"
+kairos-crypto = { path = "../kairos-crypto" }
 
 [dev-dependencies]
 assert_cmd = "2.0.13"

diff --git a/kairos-cli/src/commands/deposit.rs b/kairos-cli/src/commands/deposit.rs
@@ -1,8 +1,10 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser, Debug)]
@@ -16,7 +18,7 @@ pub struct Args {
 pub fn run(args: Args) -> Result<String, CliError> {
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

diff --git a/kairos-cli/src/commands/transfer.rs b/kairos-cli/src/commands/transfer.rs
@@ -1,10 +1,11 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::public_key::CasperPublicKey;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 use crate::utils::parse_hex_string;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser)]
@@ -18,10 +19,10 @@ pub struct Args {
 }
 
 pub fn run(args: Args) -> Result<String, CliError> {
-    let _recipient = CasperPublicKey::from_bytes(args.recipient.as_ref())?;
+    let _recipient = Signer::from_public_key(args.recipient.as_ref())?.to_public_key()?;
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

diff --git a/kairos-cli/src/commands/withdraw.rs b/kairos-cli/src/commands/withdraw.rs
@@ -1,8 +1,10 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
-use crate::crypto::error::CryptoError;
-use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
+use kairos_crypto::error::CryptoError;
+use kairos_crypto::implementations::Signer;
+use kairos_crypto::CryptoSigner;
+
 use clap::Parser;
 
 #[derive(Parser)]
@@ -16,7 +18,7 @@ pub struct Args {
 pub fn run(args: Args) -> Result<String, CliError> {
     let _amount: u64 = args.amount.field;
     let _signer =
-        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
+        Signer::from_private_key_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

diff --git a/kairos-cli/src/error.rs b/kairos-cli/src/error.rs
@@ -1,7 +1,7 @@
 use hex::FromHexError;
 use thiserror::Error;
 
-use crate::crypto::error::CryptoError;
+use kairos_crypto::error::CryptoError;
 
 #[derive(Error, Debug)]
 pub enum CliError {