SynchronousQueueClient incision

venigreat · Oct 2, 2019 · 87bd9d0 · 87bd9d0
1 parent 099359a
commit 87bd9d0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 32 deletions.
diff --git a/Sources/QueueClient/QueueClient.swift b/Sources/QueueClient/QueueClient.swift
@@ -162,13 +162,6 @@ public final class QueueClient {
         }
     }
 
-    private func handleAlivenessResponse(response: ReportAliveResponse) {
-        switch response {
-        case .aliveReportAccepted:
-            delegate?.queueClientWorkerHasBeenIndicatedAsAlive(self)
-        }
-    }
-
     private func handleScheduleTestsResponse(response: ScheduleTestsResponse) {
         switch response {
         case .scheduledTests(let requestId):

diff --git a/Sources/QueueClient/QueueClientDelegate.swift b/Sources/QueueClient/QueueClientDelegate.swift
@@ -9,8 +9,6 @@ public protocol QueueClientDelegate: class {
     func queueClientWorkerHasBeenBlocked(_ sender: QueueClient)
     func queueClient(_ sender: QueueClient, fetchBucketLaterAfter after: TimeInterval)
     func queueClient(_ sender: QueueClient, didFetchBucket bucket: Bucket)
-    func queueClientWorkerHasBeenIndicatedAsAlive(_ sender: QueueClient)
-    func queueClient(_ sender: QueueClient, didFetchQueueServerVersion version: Version)
     func queueClientDidScheduleTests(_ sender: QueueClient, requestId: RequestId)
     func queueClient(_ sender: QueueClient, didFetchJobState jobState: JobState)
     func queueClient(_ sender: QueueClient, didFetchJobResults jobResults: JobResults)

diff --git a/Sources/QueueClient/SynchronousQueueClient.swift b/Sources/QueueClient/SynchronousQueueClient.swift
@@ -18,8 +18,6 @@ public final class SynchronousQueueClient: QueueClientDelegate {
 
     private let queueClient: QueueClient
     private var bucketFetchResult: Either<BucketFetchResult, QueueClientError>?
-    private var alivenessReportResult: Either<Bool, QueueClientError>?
-    private var queueServerVersionResult: Either<Version, QueueClientError>?
     private var scheduleTestsResult: Either<RequestId, QueueClientError>?
     private var jobResultsResult: Either<JobResults, QueueClientError>?
     private var jobStateResult: Either<JobState, QueueClientError>?
@@ -147,8 +145,6 @@ public final class SynchronousQueueClient: QueueClientDelegate {
 
     public func queueClient(_ sender: QueueClient, didFailWithError error: QueueClientError) {
         bucketFetchResult = Either.error(error)
-        alivenessReportResult = Either.error(error)
-        queueServerVersionResult = Either.error(error)
         scheduleTestsResult = Either.error(error)
         jobResultsResult = Either.error(error)
         jobStateResult = Either.error(error)
@@ -174,15 +170,7 @@ public final class SynchronousQueueClient: QueueClientDelegate {
     public func queueClient(_ sender: QueueClient, didFetchBucket bucket: Bucket) {
         bucketFetchResult = Either.success(.bucket(bucket))
     }
-
-    public func queueClient(_ sender: QueueClient, didFetchQueueServerVersion version: Version) {
-        queueServerVersionResult = Either.success(version)
-    }
-
-    public func queueClientWorkerHasBeenIndicatedAsAlive(_ sender: QueueClient) {
-        alivenessReportResult = Either.success(true)
-    }
-
+
     public func queueClientDidScheduleTests(_ sender: QueueClient, requestId: RequestId) {
         scheduleTestsResult = Either.success(requestId)
     }

diff --git a/Tests/QueueClientTests/FakeQueueClientDelegate.swift b/Tests/QueueClientTests/FakeQueueClientDelegate.swift
@@ -12,8 +12,6 @@ class FakeQueueClientDelegate: QueueClientDelegate {
         case bucket(Bucket)
         case workerHasBeenBlocked
         case workerConsideredNotAlive
-        case alivenessAccepted
-        case queueServerVersion(Version)
         case didScheduleTests(RequestId)
         case fetchedJobState(JobState)
         case fecthedJobResults(JobResults)
@@ -46,14 +44,6 @@ class FakeQueueClientDelegate: QueueClientDelegate {
         responses.append(ServerResponse.bucket(bucket))
     }
 
-    func queueClient(_ sender: QueueClient, didFetchQueueServerVersion version: Version) {
-        responses.append(ServerResponse.queueServerVersion(version))
-    }
-
-    func queueClientWorkerHasBeenIndicatedAsAlive(_ sender: QueueClient) {
-        responses.append(ServerResponse.alivenessAccepted)
-    }
-
     func queueClientDidScheduleTests(_ sender: QueueClient, requestId: RequestId) {
         responses.append(ServerResponse.didScheduleTests(requestId))
     }