Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 10:38:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove enrollment fraction plumbing from UnlinkDevicesWithIdlePrimaryCommand

Browse Source
This commit is contained in:
Jon Chambers
2025-10-29 10:15:19 -04:00
committed by Jon Chambers
parent 0f950917d8
commit c4d55e099e
2 changed files with 2 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
service/src/test/java/org/whispersystems/textsecuregcm/workers/UnlinkDevicesWithIdlePrimaryCommandTest.java
View File

@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import net.sourceforge.argparse4j.inf.Namespace;
import org.junit.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.whispersystems.textsecuregcm.identity.IdentityType;
@@ -41,8 +40,7 @@ class UnlinkDevicesWithIdlePrimaryCommandTest {
public TestUnlinkDevicesWithIdlePrimaryCommand(final Clock clock,
final AccountsManager accountsManager,
final boolean isDryRun,
final int enrollmentPercentage) {
final boolean isDryRun) {
super(clock);
@@ -51,7 +49,6 @@ class UnlinkDevicesWithIdlePrimaryCommandTest {
namespace = new Namespace(Map.of(
UnlinkDevicesWithIdlePrimaryCommand.DRY_RUN_ARGUMENT, isDryRun,
UnlinkDevicesWithIdlePrimaryCommand.ENROLLMENT_PERCENTAGE_ARGUMENT, enrollmentPercentage,
UnlinkDevicesWithIdlePrimaryCommand.MAX_CONCURRENCY_ARGUMENT, 16,
UnlinkDevicesWithIdlePrimaryCommand.PRIMARY_IDLE_DAYS_ARGUMENT, UnlinkDevicesWithIdlePrimaryCommand.DEFAULT_PRIMARY_IDLE_DAYS
));
@@ -121,7 +118,7 @@ class UnlinkDevicesWithIdlePrimaryCommandTest {
}
final UnlinkDevicesWithIdlePrimaryCommand unlinkDevicesWithIdlePrimaryCommand =
new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, isDryRun, 100);
new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, isDryRun);
unlinkDevicesWithIdlePrimaryCommand.crawlAccounts(Flux.just(accountWithIdlePrimaryAndNoLinkedDevice,
accountWithActivePrimaryAndLinkedDevice,
@@ -134,65 +131,6 @@ class UnlinkDevicesWithIdlePrimaryCommandTest {
verifyNoMoreInteractions(accountsManager);
}
@Test
void crawlAccountsPartialEnrollment() {
final AccountsManager accountsManager = mock(AccountsManager.class);
when(accountsManager.removeDevice(any(), anyByte()))
.thenReturn(CompletableFuture.completedFuture(null));
final UUID enrolledAccountIdentifier = randomUUIDWithEnrollmentHash(1);
final UUID unenrolledAccountIdentifier = randomUUIDWithEnrollmentHash(25);
final byte linkedDeviceId = Device.PRIMARY_ID + 1;
final Duration idleDeviceLastSeenDuration =
Duration.ofDays(UnlinkDevicesWithIdlePrimaryCommand.DEFAULT_PRIMARY_IDLE_DAYS).plus(Duration.ofDays(1));
final Account enrolledAccount = mock(Account.class);
{
when(enrolledAccount.getIdentifier(IdentityType.ACI)).thenReturn(enrolledAccountIdentifier);
final Device primaryDevice =
generateMockDevice(Device.PRIMARY_ID, idleDeviceLastSeenDuration);
final Device linkedDevice = generateMockDevice(linkedDeviceId, idleDeviceLastSeenDuration);
when(enrolledAccount.getPrimaryDevice()).thenReturn(primaryDevice);
when(enrolledAccount.getDevices()).thenReturn(List.of(primaryDevice, linkedDevice));
}
final Account unenrolledAccount = mock(Account.class);
{
when(unenrolledAccount.getIdentifier(IdentityType.ACI)).thenReturn(unenrolledAccountIdentifier);
final Device primaryDevice =
generateMockDevice(Device.PRIMARY_ID, idleDeviceLastSeenDuration);
final Device linkedDevice = generateMockDevice(linkedDeviceId, idleDeviceLastSeenDuration);
when(unenrolledAccount.getPrimaryDevice()).thenReturn(primaryDevice);
when(unenrolledAccount.getDevices()).thenReturn(List.of(primaryDevice, linkedDevice));
}
final UnlinkDevicesWithIdlePrimaryCommand unlinkDevicesWithIdlePrimaryCommand =
new TestUnlinkDevicesWithIdlePrimaryCommand(CLOCK, accountsManager, false, 10);
unlinkDevicesWithIdlePrimaryCommand.crawlAccounts(Flux.just(enrolledAccount, unenrolledAccount));
verify(accountsManager).removeDevice(enrolledAccount, linkedDeviceId);
verifyNoMoreInteractions(accountsManager);
}
private static UUID randomUUIDWithEnrollmentHash(final int enrollmentHash) {
UUID uuid;
do {
uuid = UUID.randomUUID();
} while ((uuid.hashCode() & Integer.MAX_VALUE) % 100 != enrollmentHash);
return uuid;
}
private static Device generateMockDevice(final byte deviceId, final Duration primaryIdleDuration) {
final Device device = mock(Device.class);
when(device.getId()).thenReturn(deviceId);