EtherscanTransactionCheckerError conforms to LicalizedError, changed URLSessionProxy from public to internal

Author: albertopeam

Sources/Web3Core/KeystoreManager/EtherscanTransactionChecker.swift

@@ -10,18 +10,23 @@ public struct EtherscanTransactionChecker: TransactionChecker {
     private let urlSession: URLSessionProxy
     private let apiKey: String
 
-    public init(urlSession: URLSessionProxy, apiKey: String) {
+    public init(urlSession: URLSession, apiKey: String) {
+        self.urlSession = URLSessionProxyImplementation(urlSession: urlSession)
+        self.apiKey = apiKey
+    }
+    
+    internal init(urlSession: URLSessionProxy, apiKey: String) {
         self.urlSession = urlSession
         self.apiKey = apiKey
     }
 
     public func hasTransactions(address: String) async throws -> Bool {
         let urlString = "https://api.etherscan.io/api?module=account&action=txlist&address=\(address)&startblock=0&page=1&offset=1&sort=asc&apikey=\(apiKey)"
         guard let url = URL(string: urlString) else {
-            throw EtherscanTransactionCheckerError.invalidUrl
+            throw EtherscanTransactionCheckerError.invalidUrl(url: urlString)
         }
         let request = URLRequest(url: url)
-        let result = try await urlSession.data(request: request)
+        let result = try await urlSession.data(for: request)
         let response = try JSONDecoder().decode(Response.self, from: result.0)
         return !response.result.isEmpty
     }
@@ -34,16 +39,25 @@ extension EtherscanTransactionChecker {
     struct Transaction: Codable {}
 }
 
-public enum EtherscanTransactionCheckerError: Error {
-    case invalidUrl
+public enum EtherscanTransactionCheckerError: LocalizedError, Equatable {
+    case invalidUrl(url: String)
+    
+    public var errorDescription: String? {
+        switch self {
+        case let .invalidUrl(url):
+            return "Couldn't create URL(string: \(url))"
+        }
+    }
 }
 
-public protocol URLSessionProxy {
-    func data(request: URLRequest) async throws -> (Data, HTTPURLResponse)
+internal protocol URLSessionProxy {
+    func data(for request: URLRequest) async throws -> (Data, URLResponse)
 }
 
-extension URLSession: URLSessionProxy {
-    public func data(request: URLRequest) async throws -> (Data, HTTPURLResponse) {
-        return try await data(for: request)
+internal struct URLSessionProxyImplementation: URLSessionProxy {
+    let urlSession: URLSession
+    
+    func data(for request: URLRequest) async throws -> (Data, URLResponse) {
+        try await urlSession.data(for: request)
     }
 }

Tests/web3swiftTests/remoteTests/EtherscanTransactionCheckerTests.swift

@@ -40,6 +40,18 @@ final class EtherscanTransactionCheckerTests: XCTestCase {
             XCTAssertTrue(true)
         }
     }
+    
+    func testInitURLError() async throws {
+        do {
+            let sut = EtherscanTransactionChecker(urlSession: URLSessionMock(), apiKey: testApiKey)
+
+            _ = try await sut.hasTransactions(address: " ")
+
+            XCTFail("URL init must throw an error")
+        } catch {
+            XCTAssertTrue(error is EtherscanTransactionCheckerError)
+        }
+    }
 
     func testWrongApiKey() async throws {
         do {
@@ -54,10 +66,22 @@ final class EtherscanTransactionCheckerTests: XCTestCase {
     }
 }
 
-final class URLSessionMock: URLSessionProxy {
-    var response: (Data, HTTPURLResponse) = (Data(), HTTPURLResponse())
 
-    func data(request: URLRequest) async throws -> (Data, HTTPURLResponse) {
+// MARK: - EtherscanTransactionCheckerErrorTests
+
+final class EtherscanTransactionCheckerErrorTests: XCTestCase {
+    func testLocalizedDescription() {
+        let error = EtherscanTransactionCheckerError.invalidUrl(url: "mock url")
+        XCTAssertEqual(error.localizedDescription, "Couldn't create URL(string: mock url)")
+    }
+}
+
+// MARK: - test double
+
+final private class URLSessionMock: URLSessionProxy {
+    var response: (Data, URLResponse) = (Data(), URLResponse())
+
+    func data(for request: URLRequest) async throws -> (Data, URLResponse) {
         return response
     }
 }