Merge branch 'mkirk/cds-feedback-2'

SignalServiceKit/src/Contacts/OWSContactDiscoveryOperation.swift

@@ -416,8 +416,6 @@ class CDSFeedbackOperation: OWSOperation {
     enum FeedbackResult: String {
         case ok
         case mismatch
-        case serverError = "server-error"
-        case clientError = "client-error"
         case attestationError = "attestation-error"
         case unexpectedError = "unexpected-error"
     }
@@ -464,10 +462,9 @@ class CDSFeedbackOperation: OWSOperation {
 
         if let error = cdsOperation.failingError {
             switch error {
-            case ContactDiscoveryError.serverError:
+            case ContactDiscoveryError.serverError, ContactDiscoveryError.clientError:
-                self.makeRequest(result: .serverError)
+                // Server already has this information, no need to report.
-            case ContactDiscoveryError.clientError:
+                self.reportSuccess()
-                self.makeRequest(result: .clientError)
             case ContactDiscoveryError.attestationError:
                 self.makeRequest(result: .attestationError)
             default: