removed swiftlint issues

albertopeam · albertopeam · commit 7d38122befc5 · 2023-01-03T21:50:41.000+01:00
diff --git a/Sources/Web3Core/KeystoreManager/BIP44.swift b/Sources/Web3Core/KeystoreManager/BIP44.swift
@@ -7,12 +7,12 @@ import Foundation
 
 public protocol BIP44 {
     /**
-     Derive an `HDNode` based on the provided `path`. The function will throws `BIP44Error.warning` if it was invoked with `warns` as true and the root key doesn't have a previous child with at least one transaction, using false the child node will be derived directly not throwing. This function needs to query the blockchain history when `warns`is true,  so it can throw network errors.
-     - Parameter path: valid BIP32 path.
-     - Parameter warns: true to be warned about following BIP44 standard, false otherwise.
-     - Throws: `BIP44Error.warning` if the child key shouldn't be used according to BIP44 standard.
-     - Returns: an HDNode child key for the provided `path` if it can be created, otherwise nil
-     */
+    Derive an `HDNode` based on the provided `path`. The function will throws `BIP44Error.warning` if it was invoked with `warns` as true and the root key doesn't have a previous child with at least one transaction, using false the child node will be derived directly not throwing. This function needs to query the blockchain history when `warns`is true,  so it can throw network errors.
+    - Parameter path: valid BIP32 path.
+    - Parameter warns: true to be warned about following BIP44 standard, false otherwise.
+    - Throws: `BIP44Error.warning` if the child key shouldn't be used according to BIP44 standard.
+    - Returns: an HDNode child key for the provided `path` if it can be created, otherwise nil
+    */
     func derive(path: String, warns: Bool, transactionChecker: TransactionChecker) async throws -> HDNode?
 }
 
@@ -23,11 +23,11 @@ public enum BIP44Error: Error, Equatable {
 
 public protocol TransactionChecker {
     /**
-     It verifies if the provided `address` has at least one transaction
-     - Parameter address: to be queried
-     - Throws: any error related to query the blockchain provider
-     - Returns: true if the `address` has at least one transaction, false otherwise
-     */
+    It verifies if the provided `address` has at least one transaction
+    - Parameter address: to be queried
+    - Throws: any error related to query the blockchain provider
+    - Returns: true if the `address` has at least one transaction, false otherwise
+    */
     func hasTransactions(address: String) async throws -> Bool
 }
 
@@ -45,8 +45,8 @@ extension HDNode: BIP44 {
                     var hasTransactions = false
                     for searchAddressIndex in 0..<maxUnusedAddressIndexes {
                         if let searchPath = path.newPath(account: searchAccount, addressIndex: searchAddressIndex),
-                           let childNode = derive(path: searchPath, derivePrivateKey: true),
-                           let ethAddress = Utilities.publicToAddress(childNode.publicKey) {
+                        let childNode = derive(path: searchPath, derivePrivateKey: true),
+                        let ethAddress = Utilities.publicToAddress(childNode.publicKey) {
                             hasTransactions = try await transactionChecker.hasTransactions(address: ethAddress.address)
                             if hasTransactions {
                                 break
@@ -93,10 +93,10 @@ extension String {
     }
 
     /**
-     Transforms a bip44 path into a new one changing `account` & `index`. The resulting one will have the change value equal to `0` to represent external chain. Format `m/44'/coin_type'/account'/change/address_index`
-     - Parameter account: the new `account` to use
-     - Parameter addressIndex: the new `addressIndex` to use
-     - Returns: a valid bip44 path with the provided `account`, `addressIndex`and external `change` or nil otherwise
+    Transforms a bip44 path into a new one changing `account` & `index`. The resulting one will have the change value equal to `0` to represent external chain. Format `m/44'/coin_type'/account'/change/address_index`
+    - Parameter account: the new `account` to use
+    - Parameter addressIndex: the new `addressIndex` to use
+    - Returns: a valid bip44 path with the provided `account`, `addressIndex`and external `change` or nil otherwise
     */
     func newPath(account: Int, addressIndex: Int) -> String? {
         guard isBip44Path else {
diff --git a/Tests/web3swiftTests/localTests/BIP44Tests.swift b/Tests/web3swiftTests/localTests/BIP44Tests.swift
@@ -8,14 +8,8 @@ import Web3Core
 @testable import web3swift
 
 final class BIP44Tests: XCTestCase {
-    private var accountZeroScannedAddresses: [String]!
-    private var accountZeroAndOneScannedAddresses: [String]!
-    private var mockTransactionChecker: MockTransactionChecker!
-
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-        mockTransactionChecker = MockTransactionChecker()
-        accountZeroScannedAddresses = [
+    private var accountZeroScannedAddresses: [String] {
+        [
             "0x31a4aD7593D06D049b3Cc07aB5430264Bf7e069f",
             "0x2b4fb04d485446ade5889e77b0cbC2c71075209c",
             "0x93DDC6583D4BF6e9b309cfBdC681A78F8B5f37Ff",
@@ -36,7 +30,9 @@ final class BIP44Tests: XCTestCase {
             "0xd521A57ea2bAA6396AE916aD2bC4972a9b3635EB",
             "0x561192570145C499f0951dEc0a4Df80D0D0A96bb",
             "0x4DdBe17BB1b0056941A1425739978e44D462D7DD"]
-        accountZeroAndOneScannedAddresses = [
+    }
+    private var accountZeroAndOneScannedAddresses: [String] {
+        [
             "0x31a4aD7593D06D049b3Cc07aB5430264Bf7e069f",
             "0x3C7b0FadC415d0be5EBa971DC7Dcc39DdDcd4AF7",
             "0x73C13e421eF367c4F55BBC02a8e2a2b12e82f717",
@@ -59,13 +55,7 @@ final class BIP44Tests: XCTestCase {
             "0x111FbB56b0B5c97F2896Ee722A917b261bCC77fC",
             "0xF3F66e5C119620eBDbD7Fb48B4b5d365De5c9750"]
     }
-
-    override func tearDownWithError() throws {
-        try super.tearDownWithError()
-        mockTransactionChecker = nil
-        accountZeroScannedAddresses = nil
-        accountZeroAndOneScannedAddresses = nil
-    }
+    private var mockTransactionChecker: MockTransactionChecker = .init()
 
     func testDeriveNoWarn() async throws {
         let rootNode = try rootNode()
diff --git a/Tests/web3swiftTests/localTests/StringBIP44Tests.swift b/Tests/web3swiftTests/localTests/StringBIP44Tests.swift
@@ -7,55 +7,48 @@ import XCTest
 @testable import Web3Core
 
 final class StringBIP44Tests: XCTestCase {
-    private var invalidPaths: [String]!
-    
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-        invalidPaths = ["",
-                        "m",
-                        "m/",
-                        "m/44",
-                        "m/44'",
-                        "m/44'/",
-                        "m/44'/60",
-                        "m/44'/60'",
-                        "m/44'/60'/",
-                        "m/44'/60'/0",
-                        "m/44'/60'/0'",
-                        "m/44'/60'/0'/",
-                        "m/44'/60'/0'/0",
-                        "m/44'/60'/0'/0/",
-                        "/44'/60'/0'/0/0",
-                        "m44'/60'/0'/0/0",
-                        "m0'/60'/0'/0/0",
-                        "m/'/60'/0'/0/0",
-                        "m/60'/0'/0/0",
-                        "m/44'/60/0'/0/0",
-                        "m/44'/'/0'/0/0",
-                        "m/44'/60'/0/0/0",
-                        "m/44'/60'/'/0/0",
-                        "m/44'/60'/0'/0",
-                        "m/44'/60'/0'/0/",
-                        "m/44'/60'/0'/-1/0",
-                        "m/44'/60'/0'/2/0",
-                        "m/44'/60.0'/0'/0/0",
-                        "m/44'/60'/0.0'/0/0",
-                        "m/44'/60'/0'/0/0.0"]
+    private var invalidPaths: [String] {
+        [
+            "",
+            "m",
+            "m/",
+            "m/44",
+            "m/44'",
+            "m/44'/",
+            "m/44'/60",
+            "m/44'/60'",
+            "m/44'/60'/",
+            "m/44'/60'/0",
+            "m/44'/60'/0'",
+            "m/44'/60'/0'/",
+            "m/44'/60'/0'/0",
+            "m/44'/60'/0'/0/",
+            "/44'/60'/0'/0/0",
+            "m44'/60'/0'/0/0",
+            "m0'/60'/0'/0/0",
+            "m/'/60'/0'/0/0",
+            "m/60'/0'/0/0",
+            "m/44'/60/0'/0/0",
+            "m/44'/'/0'/0/0",
+            "m/44'/60'/0/0/0",
+            "m/44'/60'/'/0/0",
+            "m/44'/60'/0'/0",
+            "m/44'/60'/0'/0/",
+            "m/44'/60'/0'/-1/0",
+            "m/44'/60'/0'/2/0",
+            "m/44'/60.0'/0'/0/0",
+            "m/44'/60'/0.0'/0/0",
+            "m/44'/60'/0'/0/0.0"]
     }
-    
-    override func tearDownWithError() throws {
-        try super.tearDownWithError()
-        invalidPaths = nil
-    }
-    
+
     // MARK: - accountFromPath
-    
+
     func testInvalidPathReturnNilAccount() throws {
         invalidPaths.forEach { invalidPath in
             XCTAssertNil(invalidPath.accountFromPath)
         }
     }
-    
+
     func testValidPathReturnAccount() {
         let scenarios: [TestScenario<String, Int>] = [
             .init(input: "m/44'/60'/0'/1/4", expected: 0),
@@ -67,47 +60,48 @@ final class StringBIP44Tests: XCTestCase {
             XCTAssertEqual(scenario.input.accountFromPath, scenario.expected)
         }
     }
-    
+
     // MARK: - isBip44Path
-    
+
     func testVerifyBip44Paths() {
-        let validPaths = ["m/44'/0'/0'/0/0",
-                          "m/44'/1'/0'/0/0",
-                          "m/44'/0'/1'/0/0",
-                          "m/44'/0'/0'/1/0",
-                          "m/44'/0'/0'/0/1"]
+        let validPaths = [
+            "m/44'/0'/0'/0/0",
+            "m/44'/1'/0'/0/0",
+            "m/44'/0'/1'/0/0",
+            "m/44'/0'/0'/1/0",
+            "m/44'/0'/0'/0/1"]
         validPaths.forEach { validPath in
             XCTAssertTrue(validPath.isBip44Path)
         }
     }
-    
+
     func testVerifyNotBip44Paths() {
         invalidPaths.forEach { invalidPath in
             XCTAssertFalse(invalidPath.isBip44Path)
         }
     }
-    
+
     // MARK: - newPath
-    
+
     func testNotBip44PathNewPathReturnsNil() {
         invalidPaths.forEach { invalidPath in
             XCTAssertNil(invalidPath.newPath(account: Int.random(in: 0...Int.max), addressIndex: Int.random(in: 0...Int.max)))
         }
     }
-    
+
     func testNewPathGeneratesExternalChainAsZero() {
         let path = "m/44'/60'/0'/1/0"
-        
+
         let result = path.newPath(account: 0, addressIndex: 0)
-        
+
         XCTAssertEqual(result, "m/44'/60'/0'/0/0")
     }
-    
+
     func testNewPathGeneratesNewAccountAndAddressIndex() {
         let path = "m/44'/60'/1'/0/2"
-        
+
         let result = path.newPath(account: 4, addressIndex: 3)
-        
+
         XCTAssertEqual(result, "m/44'/60'/4'/0/3")
     }
 }
diff --git a/Tests/web3swiftTests/remoteTests/EtherscanTransactionCheckerTests.swift b/Tests/web3swiftTests/remoteTests/EtherscanTransactionCheckerTests.swift
@@ -7,23 +7,9 @@ import XCTest
 @testable import Web3Core
 
 final class EtherscanTransactionCheckerTests: XCTestCase {
-    private var testApiKey: String!
-    private var vitaliksAddress: String!
-    private var emptyAddress: String!
-
-    override func setUpWithError() throws {
-        try super.setUpWithError()
-        testApiKey = "4HVPVMV1PN6NGZDFXZIYKEZRP53IA41KVC"
-        vitaliksAddress = "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B"
-        emptyAddress = "0x1BeY3KhtHpfATH5Yqxz9d8Z1XbqZFSXtK7"
-    }
-
-    override func tearDownWithError() throws {
-        try super.tearDownWithError()
-        testApiKey = nil
-        vitaliksAddress = nil
-        emptyAddress = nil
-    }
+    private var testApiKey: String { "4HVPVMV1PN6NGZDFXZIYKEZRP53IA41KVC" }
+    private var vitaliksAddress: String { "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B" }
+    private var emptyAddress: String { "0x1BeY3KhtHpfATH5Yqxz9d8Z1XbqZFSXtK7" }
 
     func testHasTransactions() async throws {
         let sut = EtherscanTransactionChecker(urlSession: URLSession.shared, apiKey: testApiKey)
