fix: add conversion trait

interlay · Aug 3, 2023 · 8830613 · 8830613
1 parent ae8ece5
commit 8830613
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/vault/src/connection_manger.rs → vault/src/connection_manager.rs b/vault/src/connection_manger.rs → vault/src/connection_manager.rs
@@ -4,7 +4,7 @@ pub use crate::{
     Error,
 };
 use async_trait::async_trait;
-use backoff::{Error as BackoffError, ExponentialBackoff};
+use backoff::Error as BackoffError;
 use bitcoin::{cli::BitcoinOpts as BitcoinConfig, BitcoinCoreApi, Error as BitcoinError};
 use futures::{future::Either, Future, FutureExt};
 use governor::{Quota, RateLimiter};
@@ -135,15 +135,18 @@ impl<Config: Clone + Send + 'static, F: Fn()> ConnectionManager<Config, F> {
                 self.db_path.clone(),
             );
 
-            let backoff = ExponentialBackoff::default();
-
-            backoff::future::retry(backoff, || async {
-                match service.start().await {
-                    Ok(()) => Ok(()),
-                    Err(err) => Err(err),
+            match service.start().await {
+                Err(err @ backoff::Error::Permanent(_)) => {
+                    tracing::warn!("Disconnected: {}", err);
+                    return Err(err.into());
                 }
-            })
-            .await?;
+                Err(err) => {
+                    tracing::warn!("Disconnected: {}", err);
+                }
+                _ => {
+                    tracing::warn!("Disconnected");
+                }
+            };
 
             // propagate shutdown signal from main tasks
             let _ = shutdown_tx.send(());

diff --git a/vault/src/error.rs b/vault/src/error.rs
@@ -61,3 +61,12 @@ pub enum Error {
     #[error("System I/O error: {0}")]
     IoError(#[from] IoError),
 }
+
+impl From<backoff::Error<Error>> for Error {
+    fn from(err: backoff::Error<Error>) -> Self {
+        match err {
+            backoff::Error::Permanent(err) => err,
+            backoff::Error::Transient(err) => err,
+        }
+    }
+}
diff --git a/vault/src/lib.rs b/vault/src/lib.rs
@@ -2,6 +2,8 @@
 #![feature(array_zip)]
 
 mod cancellation;
+mod cli;
+mod connection_manager;
 pub mod delay;
 mod error;
 mod execution;
@@ -12,17 +14,14 @@ pub mod process;
 mod redeem;
 pub mod relay;
 mod replace;
-// pub mod services;
-mod cli;
-mod connection_manger;
 mod system;
 mod trace;
 mod types;
 
 pub mod service {
     pub use crate::{
         cancellation::{CancellationScheduler, IssueCanceller, ReplaceCanceller},
-        connection_manger::{
+        connection_manager::{
             init_subscriber, spawn_cancelable, wait_or_shutdown, warp, warp::Filter, ConnectionManager,
             DynBitcoinCoreApi, MonitoringConfig, Service, ServiceConfig, ShutdownSender,
         },

diff --git a/vault/src/system.rs b/vault/src/system.rs
@@ -582,7 +582,6 @@ impl VaultService {
     }
 
     async fn run_service(&self) -> Result<(), BackoffError<Error>> {
-        //ToDo: remove service error put all errors in error
         self.validate_bitcoin_network()
             .await
             .map_err(|err| BackoffError::Permanent(err))?;
@@ -609,7 +608,7 @@ impl VaultService {
                 .btc_parachain
                 .get_bitcoin_confirmations()
                 .await
-                .map_err(|err| BackoffError::Transient::<Error>(err.into()))?,
+                .map_err(|err| Error::RuntimeError(err))?,
         };
         tracing::info!("Using {} bitcoin confirmations", num_confirmations);
 
@@ -692,7 +691,7 @@ impl VaultService {
             Arc::new(Box::new(
                 OrderedVaultsDelay::new(self.btc_parachain.clone())
                     .await
-                    .map_err(|err| BackoffError::Transient::<Error>(err.into()))?,
+                    .map_err(|err| Error::RuntimeError(err))?,
             ))
         };