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

@@ -118,16 +118,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 +148,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 +177,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 +190,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))
 	}
 }