From 83cf20fd39da45c17c19387c1d6d22c2ae14fa9e Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sun, 27 Mar 2022 13:07:19 +0800
Subject: [PATCH] chore: u2fsign

---
 src/cmd_u2fsign.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cmd_u2fsign.rs b/src/cmd_u2fsign.rs
index 2e60b0f..e643504 100644
--- a/src/cmd_u2fsign.rs
+++ b/src/cmd_u2fsign.rs
@@ -59,7 +59,8 @@ impl Command for CommandImpl {
 
         information!("Start sign...");
         information!("App id: {}", app_id);
-        let mut manager = AuthenticatorService::new()?;
+        let mut manager = opt_result!(
+            AuthenticatorService::new(), "Create authenticator service failed: {}");
         manager.add_u2f_usb_hid_platform_transports();
         if let Err(e) = manager.sign(
             flags,
@@ -70,13 +71,14 @@ impl Command for CommandImpl {
             status_tx,
             callback,
         ) {
-            panic!("Couldn't register: {:?}", e);
+            return simple_error!("Couldn't register: {:?}", e);
         }
 
         let sign_result = sign_rx
             .recv()
             .expect("Problem receiving, unable to continue");
-        let (_, handle_used, sign_data, device_info) = sign_result.expect("Sign failed");
+        let (_, handle_used, sign_data, device_info) =
+            opt_result!(sign_result, "Sign failed: {}");
 
         success!("Device info: {}", &device_info);
         success!("Sign challenge: {}", u2fv2_challenge_str);