Remove duplication

app/sql.js

@@ -2750,27 +2750,32 @@ async function removeAll() {
   db.serialize(() => {
     promise = Promise.all([
       db.run('BEGIN TRANSACTION;'),
+      ...getRemoveConfigurationPromises(),
       db.run('DELETE FROM conversations;'),
+      db.run('DELETE FROM messages;'),
+      db.run('DELETE FROM attachment_downloads;'),
+      db.run('DELETE FROM messages_fts;'),
+      db.run('COMMIT TRANSACTION;'),
+    ]);
+  });
+
+  await promise;
+}
+
+function getRemoveConfigurationPromises() {
+  return [
     db.run('DELETE FROM identityKeys;'),
     db.run('DELETE FROM items;'),
-      db.run('DELETE FROM messages;'),
     db.run('DELETE FROM preKeys;'),
     db.run('DELETE FROM sessions;'),
     db.run('DELETE FROM signedPreKeys;'),
     db.run('DELETE FROM unprocessed;'),
     db.run('DELETE FROM contactPreKeys;'),
     db.run('DELETE FROM contactSignedPreKeys;'),
-      db.run('DELETE FROM attachment_downloads;'),
-      db.run('DELETE FROM messages_fts;'),
     db.run('DELETE FROM servers;'),
     db.run('DELETE FROM lastHashes;'),
     db.run('DELETE FROM seenMessages;'),
-      db.run('DELETE FROM sessions;'),
-      db.run('COMMIT TRANSACTION;'),
-    ]);
-  });
-
-  await promise;
+  ];
 }
 
 // Anything that isn't user-visible data
@@ -2780,15 +2785,7 @@ async function removeAllConfiguration() {
   db.serialize(() => {
     promise = Promise.all([
       db.run('BEGIN TRANSACTION;'),
-      db.run('DELETE FROM identityKeys;'),
-      db.run('DELETE FROM items;'),
-      db.run('DELETE FROM preKeys;'),
-      db.run('DELETE FROM sessions;'),
-      db.run('DELETE FROM signedPreKeys;'),
-      db.run('DELETE FROM unprocessed;'),
-      db.run('DELETE FROM contactPreKeys;'),
-      db.run('DELETE FROM contactSignedPreKeys;'),
-      db.run('DELETE FROM servers;'),
+      ...getRemoveConfigurationPromises(),
       db.run('COMMIT TRANSACTION;'),
     ]);
   });