From 8665e614b541c7d7d264b96c460855d48322d480 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 8 Mar 2021 01:00:00 +0100
Subject: [PATCH] Fix build and lint errors

---
 src/database/utils/serialized.ts         | 8 +++-----
 src/function/sync/apply-actions/index.ts | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/database/utils/serialized.ts b/src/database/utils/serialized.ts
index 7afa283..ecd85d1 100644
--- a/src/database/utils/serialized.ts
+++ b/src/database/utils/serialized.ts
@@ -21,15 +21,13 @@ import { Database } from '../main'
 
 export class SerializationFeatureCheckException extends Error {}
 
-export function shouldRetryWithException(database: Database, e: any): boolean {
+export function shouldRetryWithException (database: Database, e: any): boolean {
   if (e instanceof Sequelize.TimeoutError) return true
 
   if (!(e instanceof Sequelize.DatabaseError)) return false
 
   const parent = e.parent
 
-  if (typeof parent !== 'object') return false
-
   if (database.dialect === 'sqlite') {
     if (parent.message.startsWith('SQLITE_BUSY:')) return true
   } else if (database.dialect === 'postgres') {
@@ -48,7 +46,7 @@ export function shouldRetryWithException(database: Database, e: any): boolean {
   return false
 }
 
-export async function assertSerializeableTransactionsAreWorking(database: Database) {
+export async function assertSerializeableTransactionsAreWorking (database: Database) {
   // clean up just for the case
   await database.config.destroy({
     where: {
@@ -83,7 +81,7 @@ export async function assertSerializeableTransactionsAreWorking(database: Databa
           })(),
           (async () => {
             await database.config.update({ value: 'd' }, { where: { id: configItemIds.secondSelfTestData }, transaction: transactionTwo })
-          })(),
+          })()
         ])
       })
     })
diff --git a/src/function/sync/apply-actions/index.ts b/src/function/sync/apply-actions/index.ts
index e9b5ff8..151666e 100644
--- a/src/function/sync/apply-actions/index.ts
+++ b/src/function/sync/apply-actions/index.ts
@@ -104,7 +104,7 @@ export const applyActionsFromDevice = async ({ database, request, websocket, con
           }
         })
       } catch (ex) {
-        if (shouldRetryWithException(ex)) {
+        if (shouldRetryWithException(ex, database)) {
           eventHandler.countEvent('applyActionsFromDevice got exception which should cause retry')
 
           throw ex