From f735625eeb535cbd48ffb8d0cf87be1317b1d39f Mon Sep 17 00:00:00 2001
From: Gregory Hill <gregorydhill@outlook.com>
Date: Wed, 3 Mar 2021 17:31:42 +0000
Subject: [PATCH] fix(vault): prettier exit response

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
---
 vault/src/error.rs |  2 ++
 vault/src/lib.rs   | 12 ++++--------
 vault/src/main.rs  | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/vault/src/error.rs b/vault/src/error.rs
index d53f1cdda..07e5a0668 100644
--- a/vault/src/error.rs
+++ b/vault/src/error.rs
@@ -9,6 +9,8 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum Error {
+    #[error("Internal error")]
+    InternalError,
     #[error("Insufficient funds available")]
     InsufficientFunds,
     #[error("Open time inconsistent with chain height")]
diff --git a/vault/src/lib.rs b/vault/src/lib.rs
index c7ed3a4f6..c011fa72f 100644
--- a/vault/src/lib.rs
+++ b/vault/src/lib.rs
@@ -476,14 +476,10 @@ pub async fn start<B: BitcoinCoreApi + Send + Sync + 'static>(
         }),
     );
     match result {
-        Ok(_) => {
-            println!("Done");
-        }
+        Ok(_) => Ok(()),
         Err(err) => {
-            println!("Error: {}", err);
-            std::process::exit(1);
+            error!("{:?}", err);
+            Err(Error::InternalError)
         }
-    };
-
-    Ok(())
+    }
 }
diff --git a/vault/src/main.rs b/vault/src/main.rs
index acc49ecea..988cdf002 100644
--- a/vault/src/main.rs
+++ b/vault/src/main.rs
@@ -5,10 +5,9 @@ use runtime::substrate_subxt::PairSigner;
 use runtime::{PolkaBtcProvider, PolkaBtcRuntime};
 use std::sync::Arc;
 use std::time::Duration;
-use vault::{start, Error, Opts};
+use vault::{Error, Opts};
 
-#[tokio::main]
-async fn main() -> Result<(), Error> {
+async fn start() -> Result<(), Error> {
     env_logger::init();
     let opts: Opts = Opts::parse();
     let intact_opts = opts.clone();
@@ -43,5 +42,16 @@ async fn main() -> Result<(), Error> {
         .await?,
     );
 
-    start(intact_opts, provider, btc_rpc).await
+    vault::start(intact_opts, provider, btc_rpc).await
+}
+
+#[tokio::main]
+async fn main() {
+    let exit_code = if let Err(err) = start().await {
+        eprintln!("Error: {}", err);
+        1
+    } else {
+        0
+    };
+    std::process::exit(exit_code);
 }