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 @@
${project.version}
- org.signal
- zkgroup-java
- 0.8.2
+ org.whispersystems
+ signal-client-java
+ 0.10.0
org.whispersystems
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 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);