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

Don’t delete accounts after reconciling

Browse Source
This commit is contained in:
Chris Eager
2021-06-17 17:14:55 -05:00
committed by Chris Eager
parent 19617c14f8
commit eac48a6617
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
service/src/test/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTest.java
View File

@@ -20,10 +20,10 @@ class DeletedAccountsTest {
@RegisterExtension
static DynamoDbExtension dynamoDbExtension = DynamoDbExtension.builder()
.tableName("deleted_accounts_test")
.hashKey(DeletedAccounts.KEY_ACCOUNT_UUID)
.hashKey(DeletedAccounts.KEY_ACCOUNT_E164)
.attributeDefinition(AttributeDefinition.builder()
.attributeName(DeletedAccounts.KEY_ACCOUNT_UUID)
.attributeType(ScalarAttributeType.B).build())
.attributeName(DeletedAccounts.KEY_ACCOUNT_E164)
.attributeType(ScalarAttributeType.S).build())
.build();
@Test
@@ -38,20 +38,20 @@ class DeletedAccountsTest {
String firstNumber = "+14152221234";
String secondNumber = "+14152225678";
assertTrue(deletedAccounts.list(1).isEmpty());
assertTrue(deletedAccounts.listAccountsToReconcile(1).isEmpty());
deletedAccounts.put(firstUuid, firstNumber);
deletedAccounts.put(secondUuid, secondNumber);
assertEquals(1, deletedAccounts.list(1).size());
assertEquals(1, deletedAccounts.listAccountsToReconcile(1).size());
assertTrue(deletedAccounts.list(10).containsAll(
assertTrue(deletedAccounts.listAccountsToReconcile(10).containsAll(
List.of(
new Pair<>(firstUuid, firstNumber),
new Pair<>(secondUuid, secondNumber))));
deletedAccounts.delete(List.of(firstUuid, secondUuid));
deletedAccounts.markReconciled(List.of(firstNumber, secondNumber));
assertTrue(deletedAccounts.list(10).isEmpty());
assertTrue(deletedAccounts.listAccountsToReconcile(10).isEmpty());
}
}