2 files changed, 3 insertions, 15 deletions

diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts
index 6764a4037..286e343f2 100644
--- a/server/lib/job-queue/handlers/activitypub-follow.ts
+++ b/server/lib/job-queue/handlers/activitypub-follow.ts
@@ -26,12 +26,8 @@ async function processActivityPubFollow (job: kue.Job) {
   const targetActor = await getOrCreateActorAndServerAndModel(actorUrl)
 
   const fromActor = await getServerActor()
-  const options = {
-    arguments: [ fromActor, targetActor ],
-    errorMessage: 'Cannot follow with many retries.'
-  }
 
-  return retryTransactionWrapper(follow, options)
+  return retryTransactionWrapper(follow, fromActor, targetActor)
 }
 // ---------------------------------------------------------------------------
 
diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts
index f5ad076a6..a5c6bf300 100644
--- a/server/lib/job-queue/handlers/video-file.ts
+++ b/server/lib/job-queue/handlers/video-file.ts
@@ -52,19 +52,11 @@ async function processVideoFile (job: kue.Job) {
   if (payload.resolution) {
     await video.transcodeOriginalVideofile(payload.resolution, payload.isPortraitMode)
 
-    const options = {
-      arguments: [ video ],
-      errorMessage: 'Cannot execute onVideoFileTranscoderOrImportSuccess with many retries.'
-    }
-    await retryTransactionWrapper(onVideoFileTranscoderOrImportSuccess, options)
+    await retryTransactionWrapper(onVideoFileTranscoderOrImportSuccess, video)
   } else {
     await video.optimizeOriginalVideofile()
 
-    const options = {
-      arguments: [ video, payload.isNewVideo ],
-      errorMessage: 'Cannot execute onVideoFileOptimizerSuccess with many retries.'
-    }
-    await retryTransactionWrapper(onVideoFileOptimizerSuccess, options)
+    await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload.isNewVideo)
   }
 
   return video