fix: removed toByteArray function as it is now no longer needed

carbynestack · Sep 18, 2024 · 36badbd · 36badbd
1 parent b5d99c3
commit 36badbd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 32 deletions.
diff --git a/castor-common/src/main/java/io/carbynestack/castor/common/entities/TupleList.java b/castor-common/src/main/java/io/carbynestack/castor/common/entities/TupleList.java
@@ -70,19 +70,6 @@ public static <T extends Tuple<T, F>, F extends Field> TupleList<T, F> fromStrea
     }
   }
 
-  public byte[] toByteArray(){
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    this.forEach(
-            tuple -> {
-              try {
-                tuple.writeTo(outputStream);
-              } catch (IOException exception) {
-                rethrow(exception);
-              }
-            });
-    return outputStream.toByteArray();
-  }
-
   /**
    * Converts a {@link TupleList} to {@link TupleChunk}
    *

diff --git a/...src/test/java/io/carbynestack/castor/client/download/DefaultCastorIntraVcpClientTest.java b/...src/test/java/io/carbynestack/castor/client/download/DefaultCastorIntraVcpClientTest.java
@@ -24,9 +24,9 @@
 import io.carbynestack.httpclient.CsHttpClient;
 import io.carbynestack.httpclient.CsHttpClientException;
 import io.carbynestack.httpclient.CsResponseEntity;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.ArrayList;
@@ -100,28 +100,38 @@ void givenSslConfiguration_whenBuildClient_thenInitializeCsHttpClientAccordingly
 
   @SneakyThrows
   @Test
-  void givenSuccessfulRequest_whenDownloadTripleSharesAsBytes_thenReturnExpectedContent(){
+  void givenSuccessfulRequest_whenDownloadTripleSharesAsBytes_thenReturnExpectedContent() {
     UUID requestId = UUID.fromString("3dc08ff2-5eed-49a9-979e-3a3ac0e4a2cf");
     int expectedCount = 2;
     TupleList<MultiplicationTriple<Field.Gfp>, Field.Gfp> expectedTripleList =
-            new TupleList(MultiplicationTriple.class, GFP);
+        new TupleList(MultiplicationTriple.class, GFP);
+
     expectedTripleList.add(new MultiplicationTriple(GFP, testShare, testShare, testShare));
     expectedTripleList.add(new MultiplicationTriple(GFP, testShare, testShare, testShare));
+    ByteArrayOutputStream tripeListAsBytes = new ByteArrayOutputStream();
+    expectedTripleList.forEach(
+        tuple -> {
+          try {
+            tuple.writeTo(tripeListAsBytes);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
     CsResponseEntity<String, byte[]> givenResponseEntity =
-            CsResponseEntity.success(HttpStatus.SC_OK, expectedTripleList.toByteArray());
+        CsResponseEntity.success(HttpStatus.SC_OK, tripeListAsBytes.toByteArray());
 
     CastorServiceUri serviceUri = new CastorServiceUri(serviceAddress);
 
     doReturn(givenResponseEntity)
-            .when(csHttpClientMock)
-            .getForEntity(
+        .when(csHttpClientMock)
+        .getForEntity(
             serviceUri.getIntraVcpRequestTuplesUri(
-                    requestId, TupleType.MULTIPLICATION_TRIPLE_GFP, expectedCount),
+                requestId, TupleType.MULTIPLICATION_TRIPLE_GFP, expectedCount),
             Collections.emptyList(),
             byte[].class);
     TupleList actualTripleList =
-            castorIntraVcpClient.downloadTupleShares(
-                    requestId, TupleType.MULTIPLICATION_TRIPLE_GFP, expectedCount);
+        castorIntraVcpClient.downloadTupleShares(
+            requestId, TupleType.MULTIPLICATION_TRIPLE_GFP, expectedCount);
 
     assertEquals(expectedTripleList, actualTripleList);
   }

diff --git a/.../java/io/carbynestack/castor/service/download/DefaultTuplesDownloadServiceAsMasterIT.java b/.../java/io/carbynestack/castor/service/download/DefaultTuplesDownloadServiceAsMasterIT.java
@@ -35,6 +35,8 @@
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Objects;
@@ -292,17 +294,25 @@ void givenRetrievingTuplesFails_whenGetTuples_thenKeepReservationAndReservationM
         tuplesDownloadService.getTupleList(
             tupleType.getTupleCls(), tupleType.getField(), count, requestId);
 
-    assertArrayEquals(
+    TupleList actualTupleList =
         TupleList.fromStream(
-                tupleType.getTupleCls(),
-                tupleType.getField(),
-                new ByteArrayInputStream(
-                    tupleData,
-                    (int) (fragmentStartIndex * tupleType.getTupleSize()),
-                    (int) ((fragmentStartIndex + count) * tupleType.getTupleSize())),
-                count * tupleType.getTupleSize())
-            .toByteArray(),
-        tupleList);
+            tupleType.getTupleCls(),
+            tupleType.getField(),
+            new ByteArrayInputStream(
+                tupleData,
+                (int) (fragmentStartIndex * tupleType.getTupleSize()),
+                (int) ((fragmentStartIndex + count) * tupleType.getTupleSize())),
+            count * tupleType.getTupleSize());
+    ByteArrayOutputStream actualTupleData = new ByteArrayOutputStream();
+    actualTupleList.forEach(
+        tuple -> {
+          try {
+            ((Tuple<?, ?>) tuple).writeTo(actualTupleData);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
+    assertArrayEquals(actualTupleData.toByteArray(), tupleList);
 
     // no fragments stored -> existing fragment was reserved, consumed and then deleted
     assertFalse(tupleChunkFragmentRepository.findAll().iterator().hasNext());