Move NetworkResultCallback inside the class

This makes it more consistent
Automattic · Mar 25, 2020 · b3ce8fe · b3ce8fe
1 parent fac0f65
commit b3ce8fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Automattic-Tracks-iOS/Services/EventLoggingNetworkService.swift b/Automattic-Tracks-iOS/Services/EventLoggingNetworkService.swift
@@ -1,17 +1,16 @@
 import Foundation
 
-typealias NetworkResultCallback = (Result<Data?, Error>) -> Void
-
 open class EventLoggingNetworkService {
 
+    typealias ResultCallback = (Result<Data?, Error>) -> Void
 
     private let urlSession: URLSession
 
     init(urlSession: URLSession = URLSession.shared) {
         self.urlSession = urlSession
     }
 
-    func uploadFile(request: URLRequest, fileURL: URL, completion: @escaping NetworkResultCallback) {
+    func uploadFile(request: URLRequest, fileURL: URL, completion: @escaping ResultCallback) {
         urlSession.uploadTask(with: request, fromFile: fileURL, completionHandler: { data, response, error in
 
             if let error = error {

diff --git a/Automattic-Tracks-iOSTests/Test Helpers/Mocks.swift b/Automattic-Tracks-iOSTests/Test Helpers/Mocks.swift
@@ -78,7 +78,7 @@ class MockEventLoggingDelegate: EventLoggingDelegate {
 class MockEventLoggingNetworkService: EventLoggingNetworkService {
     var shouldSucceed = true
 
-    override func uploadFile(request: URLRequest, fileURL: URL, completion: @escaping NetworkResultCallback) {
+    override func uploadFile(request: URLRequest, fileURL: URL, completion: @escaping EventLoggingNetworkService.ResultCallback) {
         shouldSucceed ? completion(.success(Data())) : completion(.failure(MockError.generic))
     }
 }