Return unwrapped ErrorExt in crypto constructors.

More precise errors for caller, with the cost of manual
casting into `CryptoError` in handlers.

kairos-cli/src/commands/deposit.rs

@@ -1,4 +1,5 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
+use crate::crypto::error::CryptoError;
 use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
@@ -14,7 +15,8 @@ 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)?;
+    let _signer =
+        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/commands/transfer.rs

@@ -1,4 +1,5 @@
 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;
@@ -19,7 +20,8 @@ pub struct Args {
 pub fn run(args: Args) -> Result<String, CliError> {
     let _recipient = CasperPublicKey::from_bytes(args.recipient.as_ref())?;
     let _amount: u64 = args.amount.field;
-    let _signer = CasperSigner::from_file(args.private_key_path.field)?;
+    let _signer =
+        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/commands/withdraw.rs

@@ -1,4 +1,5 @@
 use crate::common::args::{AmountArg, PrivateKeyPathArg};
+use crate::crypto::error::CryptoError;
 use crate::crypto::signer::CasperSigner;
 use crate::error::CliError;
 
@@ -14,7 +15,8 @@ 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)?;
+    let _signer =
+        CasperSigner::from_file(args.private_key_path.field).map_err(CryptoError::from)?;
 
     // TODO: Create transaction and sign it with `signer`.
 

kairos-cli/src/crypto/private_key.rs

@@ -1,13 +1,11 @@
 use std::path::Path;
 
-use super::error::CryptoError;
+use casper_types::ErrorExt;
 
 pub struct CasperPrivateKey(pub casper_types::SecretKey);
 
 impl CasperPrivateKey {
-    pub fn from_file<P: AsRef<Path>>(file_path: P) -> Result<Self, CryptoError> {
-        casper_types::SecretKey::from_file(file_path)
-            .map(Self)
-            .map_err(|error| error.into())
+    pub fn from_file<P: AsRef<Path>>(file_path: P) -> Result<Self, ErrorExt> {
+        casper_types::SecretKey::from_file(file_path).map(Self)
     }
 }

kairos-cli/src/crypto/signer.rs

@@ -4,7 +4,7 @@ use super::private_key::CasperPrivateKey;
 use super::public_key::CasperPublicKey;
 use crate::crypto::error::CryptoError;
 use casper_types::bytesrepr::ToBytes;
-use casper_types::{crypto, PublicKey};
+use casper_types::{crypto, ErrorExt, PublicKey};
 
 pub struct CasperSigner {
     secret_key: CasperPrivateKey,
@@ -13,7 +13,7 @@ pub struct CasperSigner {
 
 #[allow(unused)]
 impl CasperSigner {
-    pub fn from_file<P: AsRef<Path>>(file_path: P) -> Result<Self, CryptoError> {
+    pub fn from_file<P: AsRef<Path>>(file_path: P) -> Result<Self, ErrorExt> {
         let secret_key = CasperPrivateKey::from_file(file_path)?;
 
         // Derive the public key.