Drop redundant tokio::timeouts for VSS IO

Now that we rely on `reqwest` v0.12.* retry logic as well as client-side
timeouts, we can address the remaining TODOs here and simply drop the
redundant `tokio::timeout`s we previously added as a safeguard to
blocking tasks (even though in the worst cases we saw they never
actually fired).

Author: tnull

src/io/vss_store.rs

@@ -13,7 +13,6 @@ use std::panic::RefUnwindSafe;
 use std::pin::Pin;
 use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
-use std::time::Duration;
 
 use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
 use lightning::io::{self, Error, ErrorKind};
@@ -35,7 +34,6 @@ use crate::io::utils::check_namespace_key_validity;
 // We set this to a small number of threads that would still allow to make some progress if one
 // would hit a blocking case
 const INTERNAL_RUNTIME_WORKERS: usize = 2;
-const VSS_IO_TIMEOUT: Duration = Duration::from_secs(5);
 
 /// A [`KVStoreSync`] implementation that writes to and reads from a [VSS](https://github.com/lightningdevkit/vss-server/blob/main/README.md) backend.
 pub struct VssStore {
@@ -118,16 +116,7 @@ impl KVStoreSync for VssStore {
 		let inner = Arc::clone(&self.inner);
 		let fut =
 			async move { inner.read_internal(primary_namespace, secondary_namespace, key).await };
-		// TODO: We could drop the timeout here once we ensured vss-client's Retry logic always
-		// times out.
-		tokio::task::block_in_place(move || {
-			internal_runtime.block_on(async move {
-				tokio::time::timeout(VSS_IO_TIMEOUT, fut).await.map_err(|_| {
-					let msg = "VssStore::read timed out";
-					Error::new(ErrorKind::Other, msg)
-				})
-			})?
-		})
+		tokio::task::block_in_place(move || internal_runtime.block_on(fut))
 	}
 
 	fn write(
@@ -157,16 +146,7 @@ impl KVStoreSync for VssStore {
 				)
 				.await
 		};
-		// TODO: We could drop the timeout here once we ensured vss-client's Retry logic always
-		// times out.
-		tokio::task::block_in_place(move || {
-			internal_runtime.block_on(async move {
-				tokio::time::timeout(VSS_IO_TIMEOUT, fut).await.map_err(|_| {
-					let msg = "VssStore::write timed out";
-					Error::new(ErrorKind::Other, msg)
-				})
-			})?
-		})
+		tokio::task::block_in_place(move || internal_runtime.block_on(fut))
 	}
 
 	fn remove(
@@ -195,16 +175,7 @@ impl KVStoreSync for VssStore {
 				)
 				.await
 		};
-		// TODO: We could drop the timeout here once we ensured vss-client's Retry logic always
-		// times out.
-		tokio::task::block_in_place(move || {
-			internal_runtime.block_on(async move {
-				tokio::time::timeout(VSS_IO_TIMEOUT, fut).await.map_err(|_| {
-					let msg = "VssStore::remove timed out";
-					Error::new(ErrorKind::Other, msg)
-				})
-			})?
-		})
+		tokio::task::block_in_place(move || internal_runtime.block_on(fut))
 	}
 
 	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
@@ -217,16 +188,7 @@ impl KVStoreSync for VssStore {
 		let secondary_namespace = secondary_namespace.to_string();
 		let inner = Arc::clone(&self.inner);
 		let fut = async move { inner.list_internal(primary_namespace, secondary_namespace).await };
-		// TODO: We could drop the timeout here once we ensured vss-client's Retry logic always
-		// times out.
-		tokio::task::block_in_place(move || {
-			internal_runtime.block_on(async move {
-				tokio::time::timeout(VSS_IO_TIMEOUT, fut).await.map_err(|_| {
-					let msg = "VssStore::list timed out";
-					Error::new(ErrorKind::Other, msg)
-				})
-			})?
-		})
+		tokio::task::block_in_place(move || internal_runtime.block_on(fut))
 	}
 }