From 73ea6e4251b17c95855499b90727f0c57d79d298 Mon Sep 17 00:00:00 2001
From: Jordan Rose <jrose@signal.org>
Date: Tue, 9 Nov 2021 15:18:45 -0800
Subject: [PATCH] Replace zkgroup with libsignal-client

---
 service/pom.xml                                             | 6 +++---
 .../textsecuregcm/controllers/SubscriptionController.java   | 4 ++--
 .../textsecuregcm/entities/RedeemReceiptRequest.java        | 1 -
 .../textsecuregcm/storage/IssuedReceiptsManagerTest.java    | 4 ++--
 .../tests/controllers/DonationControllerTest.java           | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/service/pom.xml b/service/pom.xml
index 57eb6c922..41d7f497f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -53,9 +53,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.signal</groupId>
-      <artifactId>zkgroup-java</artifactId>
-      <version>0.8.2</version>
+      <groupId>org.whispersystems</groupId>
+      <artifactId>signal-client-java</artifactId>
+      <version>0.10.0</version>
     </dependency>
     <dependency>
       <groupId>org.whispersystems</groupId>
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
index 3b9c50eda..8c402a309 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java
@@ -703,7 +703,7 @@ public class SubscriptionController {
       this.receiptCredentialRequest = receiptCredentialRequest;
     }
 
-    @ExactlySize(ReceiptCredentialRequest.SIZE)
+    @NotEmpty
     public byte[] getReceiptCredentialRequest() {
       return receiptCredentialRequest;
     }
@@ -719,7 +719,7 @@ public class SubscriptionController {
       this.receiptCredentialResponse = receiptCredentialResponse;
     }
 
-    @ExactlySize(ReceiptCredentialResponse.SIZE)
+    @NotEmpty
     public byte[] getReceiptCredentialResponse() {
       return receiptCredentialResponse;
     }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java
index ab72a31ab..f01ae859d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java
@@ -28,7 +28,6 @@ public class RedeemReceiptRequest {
   }
 
   @NotEmpty
-  @ExactlySize({ReceiptCredentialPresentation.SIZE})
   public byte[] getReceiptCredentialPresentation() {
     return receiptCredentialPresentation;
   }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java
index 2092516dd..486c85172 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java
@@ -56,7 +56,7 @@ class IssuedReceiptsManagerTest {
   @Test
   void testRecordIssuance() {
     Instant now = Instant.ofEpochSecond(NOW_EPOCH_SECONDS);
-    byte[] request1 = new byte[ReceiptCredentialRequest.SIZE];
+    byte[] request1 = new byte[20];
     SECURE_RANDOM.nextBytes(request1);
     when(receiptCredentialRequest.serialize()).thenReturn(request1);
     CompletableFuture<Void> future = issuedReceiptsManager.recordIssuance("item-1", receiptCredentialRequest, now);
@@ -67,7 +67,7 @@ class IssuedReceiptsManagerTest {
     assertThat(future).succeedsWithin(Duration.ofSeconds(3));
 
     // same item with new request should fail
-    byte[] request2 = new byte[ReceiptCredentialRequest.SIZE];
+    byte[] request2 = new byte[20];
     SECURE_RANDOM.nextBytes(request2);
     when(receiptCredentialRequest.serialize()).thenReturn(request2);
     future = issuedReceiptsManager.recordIssuance("item-1", receiptCredentialRequest, now);
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java
index bd136b37b..0e11fff2d 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/DonationControllerTest.java
@@ -119,7 +119,7 @@ class DonationControllerTest {
     receiptSerialBytes = new byte[ReceiptSerial.SIZE];
     SECURE_RANDOM.nextBytes(receiptSerialBytes);
     receiptSerial = new ReceiptSerial(receiptSerialBytes);
-    presentation = new byte[ReceiptCredentialPresentation.SIZE];
+    presentation = new byte[25];
     SECURE_RANDOM.nextBytes(presentation);
     receiptCredentialPresentationFactory = mock(DonationController.ReceiptCredentialPresentationFactory.class);
     receiptCredentialPresentation = mock(ReceiptCredentialPresentation.class);