diff --git a/service/pom.xml b/service/pom.xml index 41b13a6b2..dfb12a7ba 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -41,8 +41,8 @@ org.signal - zkgroup-java - 0.9.0 + libsignal-server + 0.15.0 org.whispersystems diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index e0da5dd1f..da23674f7 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -57,11 +57,11 @@ import org.eclipse.jetty.servlets.CrossOriginFilter; import org.glassfish.jersey.server.ServerProperties; import org.jdbi.v3.core.Jdbi; import org.signal.i18n.HeaderControlledResourceBundleLookup; -import org.signal.zkgroup.ServerSecretParams; -import org.signal.zkgroup.auth.ServerZkAuthOperations; -import org.signal.zkgroup.profiles.ServerZkProfileOperations; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ServerZkReceiptOperations; +import org.signal.libsignal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.auth.ServerZkAuthOperations; +import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.dispatch.DispatchManager; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/CertificateController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/CertificateController.java index 8c2fdeeda..7c8e4b7fe 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/CertificateController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/CertificateController.java @@ -23,7 +23,7 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.signal.zkgroup.auth.ServerZkAuthOperations; +import org.signal.libsignal.zkgroup.auth.ServerZkAuthOperations; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.CertificateGenerator; import org.whispersystems.textsecuregcm.entities.DeliveryCertificate; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DonationController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DonationController.java index ca76d79af..779759bb4 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DonationController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DonationController.java @@ -43,11 +43,11 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptSerial; -import org.signal.zkgroup.receipts.ServerZkReceiptOperations; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java index bbf7e9fec..a2a37924c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java @@ -52,13 +52,13 @@ import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringUtils; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.profiles.PniCredentialResponse; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.signal.zkgroup.profiles.ServerZkProfileOperations; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.profiles.PniCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.auth.Anonymous; 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 d81d04a05..dcb4f5955 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/SubscriptionController.java @@ -61,11 +61,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; -import org.signal.zkgroup.receipts.ReceiptCredentialResponse; -import org.signal.zkgroup.receipts.ServerZkReceiptOperations; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse; +import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; @@ -720,7 +720,7 @@ public class SubscriptionController { this.receiptCredentialRequest = receiptCredentialRequest; } - @ExactlySize(ReceiptCredentialRequest.SIZE) + @NotEmpty public byte[] getReceiptCredentialRequest() { return receiptCredentialRequest; } @@ -736,7 +736,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/CreateProfileRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java index e0067d431..e98e9e668 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/CreateProfileRequest.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; import org.whispersystems.textsecuregcm.util.ExactlySize; public class CreateProfileRequest { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialProfileResponse.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialProfileResponse.java index ae4df34ae..327bf0888 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialProfileResponse.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialProfileResponse.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import javax.annotation.Nullable; -import org.signal.zkgroup.profiles.PniCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.PniCredentialResponse; public class PniCredentialProfileResponse extends CredentialProfileResponse { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialResponseAdapter.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialResponseAdapter.java index d2000e7d3..a981bd0d1 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialResponseAdapter.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/PniCredentialResponseAdapter.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; import java.util.Base64; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.PniCredentialResponse; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.PniCredentialResponse; public class PniCredentialResponseAdapter { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCommitmentAdapter.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCommitmentAdapter.java index 11f4e7a4b..29fd82e7c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCommitmentAdapter.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCommitmentAdapter.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; import java.util.Base64; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; public class ProfileKeyCommitmentAdapter { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialProfileResponse.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialProfileResponse.java index a642e63ea..72f00fd78 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialProfileResponse.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialProfileResponse.java @@ -8,7 +8,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; import javax.annotation.Nullable; public class ProfileKeyCredentialProfileResponse extends CredentialProfileResponse { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialResponseAdapter.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialResponseAdapter.java index b70c82d89..ff60178d7 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialResponseAdapter.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ProfileKeyCredentialResponseAdapter.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; import java.util.Base64; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; public class ProfileKeyCredentialResponseAdapter { 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..40afb0b08 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java @@ -8,7 +8,7 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.NotEmpty; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; import org.whispersystems.textsecuregcm.util.ExactlySize; public class RedeemReceiptRequest { @@ -28,7 +28,6 @@ public class RedeemReceiptRequest { } @NotEmpty - @ExactlySize({ReceiptCredentialPresentation.SIZE}) public byte[] getReceiptCredentialPresentation() { return receiptCredentialPresentation; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManager.java index 2726041e8..2b20de4dc 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManager.java @@ -25,7 +25,7 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import javax.ws.rs.ClientErrorException; import javax.ws.rs.core.Response.Status; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient; import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException; import software.amazon.awssdk.services.dynamodb.model.ReturnValue; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManager.java index e58ff0337..b59ee48d6 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedeemedReceiptsManager.java @@ -13,7 +13,7 @@ import java.util.Objects; import java.util.UUID; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; -import org.signal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.receipts.ReceiptSerial; import org.whispersystems.textsecuregcm.util.AttributeValues; import org.whispersystems.textsecuregcm.util.UUIDUtil; import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java index aef0dcfe1..3cb85d4de 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ZkParamsCommand.java @@ -7,8 +7,8 @@ package org.whispersystems.textsecuregcm.workers; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.ServerSecretParams; import io.dropwizard.cli.Command; import io.dropwizard.setup.Bootstrap; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SubscriptionControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SubscriptionControllerTest.java index a155759bb..07e7e53af 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SubscriptionControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/SubscriptionControllerTest.java @@ -25,7 +25,7 @@ import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.signal.zkgroup.receipts.ServerZkReceiptOperations; +import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.badges.BadgeTranslator; 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..4c9cd8364 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/IssuedReceiptsManagerTest.java @@ -18,7 +18,7 @@ import org.assertj.core.api.Condition; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.signal.zkgroup.receipts.ReceiptCredentialRequest; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest; import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType; @@ -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/CertificateControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java index 1bef8ea66..38028bd37 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java @@ -26,11 +26,11 @@ import org.apache.commons.lang3.StringUtils; import org.glassfish.jersey.test.grizzly.GrizzlyWebTestContainerFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.signal.zkgroup.ServerSecretParams; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.auth.AuthCredentialResponse; -import org.signal.zkgroup.auth.ClientZkAuthOperations; -import org.signal.zkgroup.auth.ServerZkAuthOperations; +import org.signal.libsignal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse; +import org.signal.libsignal.zkgroup.auth.ClientZkAuthOperations; +import org.signal.libsignal.zkgroup.auth.ServerZkAuthOperations; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.CertificateGenerator; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; 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 d91451e36..e6033ab83 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 @@ -39,10 +39,10 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.signal.zkgroup.receipts.ReceiptSerial; -import org.signal.zkgroup.receipts.ServerZkReceiptOperations; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; +import org.signal.libsignal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.receipts.ServerZkReceiptOperations; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.configuration.BadgeConfiguration; @@ -120,7 +120,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); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java index 6036e9d8e..47fa2757b 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java @@ -53,18 +53,18 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentCaptor; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.ServerPublicParams; -import org.signal.zkgroup.ServerSecretParams; -import org.signal.zkgroup.VerificationFailedException; -import org.signal.zkgroup.profiles.ClientZkProfileOperations; -import org.signal.zkgroup.profiles.PniCredentialResponse; -import org.signal.zkgroup.profiles.ProfileKey; -import org.signal.zkgroup.profiles.ProfileKeyCommitment; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequest; -import org.signal.zkgroup.profiles.ProfileKeyCredentialRequestContext; -import org.signal.zkgroup.profiles.ProfileKeyCredentialResponse; -import org.signal.zkgroup.profiles.ServerZkProfileOperations; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.ServerPublicParams; +import org.signal.libsignal.zkgroup.ServerSecretParams; +import org.signal.libsignal.zkgroup.VerificationFailedException; +import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations; +import org.signal.libsignal.zkgroup.profiles.PniCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ProfileKey; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCommitment; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequest; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialRequestContext; +import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredentialResponse; +import org.signal.libsignal.zkgroup.profiles.ServerZkProfileOperations; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.OptionalAccess; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java index 770a02917..c9732f7db 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/RedeemedReceiptsManagerTest.java @@ -18,8 +18,8 @@ import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.signal.zkgroup.InvalidInputException; -import org.signal.zkgroup.receipts.ReceiptSerial; +import org.signal.libsignal.zkgroup.InvalidInputException; +import org.signal.libsignal.zkgroup.receipts.ReceiptSerial; import org.whispersystems.textsecuregcm.storage.DynamoDbExtension; import org.whispersystems.textsecuregcm.storage.RedeemedReceiptsManager; import org.whispersystems.textsecuregcm.tests.util.AuthHelper;