Revert "[internal] test batch and stream API paths for load/store fro…

…m remote store (pantsbuild#15996)" This reverts commit 2fa8671. [ci skip-build-wheels]
tdyas · Jun 30, 2022 · 159bc9f · 159bc9f
1 parent 27628c3
commit 159bc9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 61 deletions.
diff --git a/src/rust/engine/fs/store/src/remote.rs b/src/rust/engine/fs/store/src/remote.rs
@@ -235,7 +235,7 @@ impl ByteStore {
     }
   }
 
-  pub(crate) async fn store_bytes_source_batch<ByteSource>(
+  async fn store_bytes_source_batch<ByteSource>(
     &self,
     digest: Digest,
     bytes: ByteSource,
@@ -259,7 +259,7 @@ impl ByteStore {
     Ok(())
   }
 
-  pub(crate) async fn store_bytes_source_stream<ByteSource>(
+  async fn store_bytes_source_stream<ByteSource>(
     &self,
     digest: Digest,
     bytes: ByteSource,
@@ -349,7 +349,7 @@ impl ByteStore {
     }
   }
 
-  pub(crate) async fn load_bytes_with_batch<
+  async fn load_bytes_with_batch<
     T: Send + 'static,
     F: Fn(Bytes) -> Result<T, String> + Send + Sync + Clone + 'static,
   >(
@@ -390,7 +390,7 @@ impl ByteStore {
     }
   }
 
-  pub(crate) async fn load_bytes_with_stream<
+  async fn load_bytes_with_stream<
     T: Send + 'static,
     F: Fn(Bytes) -> Result<T, String> + Send + Sync + Clone + 'static,
   >(

diff --git a/src/rust/engine/fs/store/src/remote_tests.rs b/src/rust/engine/fs/store/src/remote_tests.rs
@@ -307,63 +307,6 @@ async fn list_missing_digests_error() {
   );
 }
 
-#[tokio::test]
-async fn load_via_each_api() {
-  let _ = WorkunitStore::setup_for_tests();
-  let cas = StubCAS::empty();
-
-  let data = TestData::roland();
-  {
-    let mut blobs = cas.blobs.lock();
-    blobs.insert(data.fingerprint(), data.bytes());
-  }
-
-  let store = new_byte_store(&cas);
-  let result_batch = store
-    .load_bytes_with_batch(data.digest(), |b| Ok(b))
-    .await
-    .unwrap()
-    .unwrap();
-  let result_stream = store
-    .load_bytes_with_stream(data.digest(), |b| Ok(b))
-    .await
-    .unwrap()
-    .unwrap();
-  assert_eq!(result_batch, data.bytes());
-  assert_eq!(result_stream, data.bytes());
-}
-
-#[tokio::test]
-async fn store_via_each_api() {
-  let _ = WorkunitStore::setup_for_tests();
-  let cas = StubCAS::empty();
-
-  let data = TestData::roland();
-  let store = new_byte_store(&cas);
-
-  let bytes = data.bytes();
-  let _ = store
-    .store_bytes_source_batch(data.digest(), move |r| bytes.slice(r))
-    .await
-    .unwrap();
-  {
-    let mut blobs = cas.blobs.lock();
-    assert_eq!(*blobs.get(&data.digest().hash).unwrap(), data.bytes());
-    blobs.clear();
-  }
-
-  let bytes = data.bytes();
-  let _ = store
-    .store_bytes_source_stream(data.digest(), move |r| bytes.slice(r))
-    .await
-    .unwrap();
-  {
-    let mut blobs = cas.blobs.lock();
-    assert_eq!(*blobs.get(&data.digest().hash).unwrap(), data.bytes());
-    blobs.clear();
-  }
-}
-
 fn new_byte_store(cas: &StubCAS) -> ByteStore {
   ByteStore::new(
     &cas.address(),