From 69990c23a5d5dd784524ffacb3f266506b518720 Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Tue, 5 Dec 2023 16:16:05 -0600
Subject: [PATCH] Avoid test dep in integration-test

---
 integration-tests/pom.xml                            |  7 -------
 .../main/java/org/signal/integration/Operations.java | 12 +++++++++---
 .../main/java/org/signal/integration/TestUser.java   |  5 +++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 8cac1b5b4..5f2882b16 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -11,13 +11,6 @@
   <artifactId>integration-tests</artifactId>
 
   <dependencies>
-    <dependency>
-      <groupId>org.whispersystems.textsecure</groupId>
-      <artifactId>service</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-    </dependency>
-
     <dependency>
       <groupId>org.whispersystems.textsecure</groupId>
       <artifactId>service</artifactId>
diff --git a/integration-tests/src/main/java/org/signal/integration/Operations.java b/integration-tests/src/main/java/org/signal/integration/Operations.java
index 170156ff9..38c6e175a 100644
--- a/integration-tests/src/main/java/org/signal/integration/Operations.java
+++ b/integration-tests/src/main/java/org/signal/integration/Operations.java
@@ -17,6 +17,7 @@ import java.net.URL;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -47,7 +48,6 @@ import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.util.HeaderUtils;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
-import org.whispersystems.textsecuregcm.util.TestRandomUtil;
 
 public final class Operations {
 
@@ -67,8 +67,8 @@ public final class Operations {
   }
 
   public static TestUser newRegisteredUser(final String number) {
-    final byte[] registrationPassword = TestRandomUtil.nextBytes(32);
-    final String accountPassword = Base64.getEncoder().encodeToString(TestRandomUtil.nextBytes(32));
+    final byte[] registrationPassword = randomBytes(32);
+    final String accountPassword = Base64.getEncoder().encodeToString(randomBytes(32));
 
     final TestUser user = TestUser.create(number, accountPassword, registrationPassword);
     final AccountAttributes accountAttributes = user.accountAttributes();
@@ -156,6 +156,12 @@ public final class Operations {
     }
   }
 
+  private static byte[] randomBytes(int numBytes) {
+    final byte[] bytes = new byte[numBytes];
+    new SecureRandom().nextBytes(bytes);
+    return bytes;
+  }
+
   public static RequestBuilder apiGet(final String endpoint) {
     return new RequestBuilder(HttpRequest.newBuilder().GET(), endpoint);
   }
diff --git a/integration-tests/src/main/java/org/signal/integration/TestUser.java b/integration-tests/src/main/java/org/signal/integration/TestUser.java
index 734f90ebf..07be08071 100644
--- a/integration-tests/src/main/java/org/signal/integration/TestUser.java
+++ b/integration-tests/src/main/java/org/signal/integration/TestUser.java
@@ -9,12 +9,12 @@ import static java.util.Objects.requireNonNull;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import org.whispersystems.textsecuregcm.util.TestRandomUtil;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -58,7 +58,8 @@ public class TestUser {
     final int registrationId = KeyHelper.generateRegistrationId(false);
     final int pniRegistrationId = KeyHelper.generateRegistrationId(false);
     // uak
-    final byte[] unidentifiedAccessKey = TestRandomUtil.nextBytes(UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH);
+    final byte[] unidentifiedAccessKey = new byte[UnidentifiedAccessUtil.UNIDENTIFIED_ACCESS_KEY_LENGTH];
+    new SecureRandom().nextBytes(unidentifiedAccessKey);
 
     return new TestUser(
         registrationId,