Fix inadvertent API change (#10245)

Author: paulb777

FirebaseStorage/Sources/StorageReference.swift

@@ -410,15 +410,15 @@ import Foundation
    *       the current `StorageReference`.
    */
   @objc(listAllWithCompletion:)
-  open func listAll(completion: @escaping ((_: StorageListResult?, _: NSError?) -> Void)) {
+  open func listAll(completion: @escaping ((_: StorageListResult?, _: Error?) -> Void)) {
     let fetcherService = storage.fetcherServiceForApp
     var prefixes = [StorageReference]()
     var items = [StorageReference]()
 
     weak var weakSelf = self
 
-    var paginatedCompletion: ((_: StorageListResult?, _: NSError?) -> Void)?
-    paginatedCompletion = { (_ listResult: StorageListResult?, _ error: NSError?) in
+    var paginatedCompletion: ((_: StorageListResult?, _: Error?) -> Void)?
+    paginatedCompletion = { (_ listResult: StorageListResult?, _ error: Error?) in
       if let error = error {
         completion(nil, error)
         return

FirebaseStorage/Tests/Unit/StorageAPITests.swift

@@ -54,55 +54,58 @@ final class StorageAPITests: XCTestCase {
 
     _ = ref.putData(Data())
     _ = ref.putData(Data(), metadata: metadata)
-    _ = ref.putData(Data(), metadata: metadata) { result in
+    _ = ref.putData(Data(), metadata: metadata) { (result: Result<StorageMetadata, Error>) in
     }
-    _ = ref.putData(Data(), metadata: metadata) { metadata, error in
+    _ = ref.putData(Data(), metadata: metadata) { (result: StorageMetadata?, error: Error?) in
     }
 
     let file = URL(string: "my-url")!
     _ = ref.putFile(from: file)
     _ = ref.putFile(from: file, metadata: metadata)
-    _ = ref.putFile(from: file, metadata: metadata) { result in
+    _ = ref.putFile(from: file, metadata: metadata) { (result: Result<StorageMetadata, Error>) in
     }
-    _ = ref.putFile(from: file, metadata: metadata) { metadata, error in
+    _ = ref.putFile(from: file, metadata: metadata) { (result: StorageMetadata?, error: Error?) in
     }
 
-    _ = ref.getData(maxSize: 122) { data, error in
+    _ = ref.getData(maxSize: 122) { (result: Data?, error: Error?) in
     }
-    _ = ref.getData(maxSize: 122) { result in
+    _ = ref.getData(maxSize: 122) { (result: Result<Data, Error>) in
     }
 
-    ref.downloadURL { url, error in
+    ref.downloadURL { (result: URL?, error: Error?) in
     }
-    ref.downloadURL { result in
+    ref.downloadURL { (result: Result<URL, Error>) in
     }
 
     ref.write(toFile: file)
-    ref.write(toFile: file) { url, error in
+    ref.write(toFile: file) { (result: URL?, error: Error?) in
     }
-    ref.write(toFile: file) { result in
+    ref.write(toFile: file) { (result: Result<URL, Error>) in
     }
 
-    ref.listAll { listResult, error in
+    ref.listAll { (listResult: StorageListResult?, error: Error?) in
     }
-    ref.listAll { result in
+    ref.listAll { (result: Result<StorageListResult, Error>) in
     }
 
-    ref.list(maxResults: 123) { listResult, error in
+    ref.list(maxResults: 123) { (listResult: StorageListResult?, error: Error?) in
     }
-    ref.list(maxResults: 222) { result in
-    }
-    ref.list(maxResults: 123, pageToken: "pageToken") { listResult, error in
-    }
-    ref.list(maxResults: 222, pageToken: "pageToken") { result in
+    ref.list(maxResults: 222) { (result: Result<StorageListResult, Error>) in
     }
+    ref
+      .list(maxResults: 123,
+            pageToken: "pageToken") { (listResult: StorageListResult?, error: Error?) in
+      }
+    ref
+      .list(maxResults: 222, pageToken: "pageToken") { (result: Result<StorageListResult, Error>) in
+      }
 
-    ref.getMetadata { result in
+    ref.getMetadata { (result: Result<StorageMetadata, Error>) in
     }
-    ref.getMetadata { metadata, error in
+    ref.getMetadata { (result: StorageMetadata?, error: Error?) in
     }
 
-    ref.delete { error in
+    ref.delete { (error: Error?) in
     }
   }