f Drop execute_locked_read

Author: tnull

src/io/vss_store.rs

@@ -93,9 +93,7 @@ impl KVStoreSync for VssStore {
 	fn read(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> io::Result<Vec<u8>> {
-		let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
-		let fut =
-			self.inner.read_internal(locking_key, primary_namespace, secondary_namespace, key);
+		let fut = self.inner.read_internal(primary_namespace, secondary_namespace, key);
 		self.runtime.block_on(fut)
 	}
 
@@ -143,13 +141,12 @@ impl KVStore for VssStore {
 	fn read(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + Send>> {
-		let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 		let primary_namespace = primary_namespace.to_string();
 		let secondary_namespace = secondary_namespace.to_string();
 		let key = key.to_string();
 		let inner = Arc::clone(&self.inner);
 		Box::pin(async move {
-			inner.read_internal(locking_key, &primary_namespace, &secondary_namespace, &key).await
+			inner.read_internal(&primary_namespace, &secondary_namespace, &key).await
 		})
 	}
 	fn write(
@@ -304,38 +301,34 @@ impl VssStoreInner {
 	}
 
 	async fn read_internal(
-		&self, locking_key: String, primary_namespace: &str, secondary_namespace: &str, key: &str,
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> io::Result<Vec<u8>> {
 		check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "read")?;
 
-		self.execute_locked_read(locking_key, async move || {
-			let obfuscated_key =
-				self.build_obfuscated_key(primary_namespace, secondary_namespace, key);
-			let request = GetObjectRequest { store_id: self.store_id.clone(), key: obfuscated_key };
-			let resp = self.client.get_object(&request).await.map_err(|e| {
-				let msg = format!(
-					"Failed to read from key {}/{}/{}: {}",
-					primary_namespace, secondary_namespace, key, e
-				);
-				match e {
-					VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
-					_ => Error::new(ErrorKind::Other, msg),
-				}
-			})?;
-
-			// unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
-			// it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
-			let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
-				let msg = format!(
-					"Failed to decode data read from key {}/{}/{}: {}",
-					primary_namespace, secondary_namespace, key, e
-				);
-				Error::new(ErrorKind::Other, msg)
-			})?;
-
-			Ok(self.storable_builder.deconstruct(storable)?.0)
-		})
-		.await
+		let obfuscated_key = self.build_obfuscated_key(primary_namespace, secondary_namespace, key);
+		let request = GetObjectRequest { store_id: self.store_id.clone(), key: obfuscated_key };
+		let resp = self.client.get_object(&request).await.map_err(|e| {
+			let msg = format!(
+				"Failed to read from key {}/{}/{}: {}",
+				primary_namespace, secondary_namespace, key, e
+			);
+			match e {
+				VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
+				_ => Error::new(ErrorKind::Other, msg),
+			}
+		})?;
+
+		// unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
+		// it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
+		let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
+			let msg = format!(
+				"Failed to decode data read from key {}/{}/{}: {}",
+				primary_namespace, secondary_namespace, key, e
+			);
+			Error::new(ErrorKind::Other, msg)
+		})?;
+
+		Ok(self.storable_builder.deconstruct(storable)?.0)
 	}
 
 	async fn write_internal(
@@ -445,21 +438,6 @@ impl VssStoreInner {
 		res
 	}
 
-	async fn execute_locked_read<
-		F: Future<Output = Result<Vec<u8>, lightning::io::Error>>,
-		FN: FnOnce() -> F,
-	>(
-		&self, locking_key: String, callback: FN,
-	) -> Result<Vec<u8>, lightning::io::Error> {
-		let inner_lock_ref = self.get_inner_lock_ref(locking_key.clone());
-		let res = {
-			let _guard = inner_lock_ref.read().await;
-			callback().await
-		};
-		self.clean_locks(&inner_lock_ref, locking_key);
-		res
-	}
-
 	fn clean_locks(&self, inner_lock_ref: &Arc<RwLock<u64>>, locking_key: String) {
 		// If there no arcs in use elsewhere, this means that there are no in-flight writes. We can remove the map entry
 		// to prevent leaking memory. The two arcs that are expected are the one in the map and the one held here in