[CHANGE] SwiftFormat Source Files

Sources/Web3Swift/Account/EthereumAccount+SignTransaction.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumAccount+SignTransaction.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Account/EthereumAccount.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumAccount.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Account/EthereumKeyStorage+Password.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumKeyStorage+Password.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Account/EthereumKeyStorage.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumKeyStorage.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -32,7 +32,7 @@ public class EthereumKeyLocalStorage: EthereumSingleKeyStorageProtocol {
     private let localFileName = "ethereumkey"
 
     private var addressPath: String? {
-        guard let address = address else {
+        guard let address else {
             return nil
         }
         if let url = folderPath {
@@ -58,7 +58,7 @@ public class EthereumKeyLocalStorage: EthereumSingleKeyStorageProtocol {
     private let fileManager = FileManager.default
 
     public func storePrivateKey(key: Data) throws {
-        guard let localPath = localPath else {
+        guard let localPath else {
             throw EthereumKeyStorageError.failedToSave
         }
 
@@ -70,7 +70,7 @@ public class EthereumKeyLocalStorage: EthereumSingleKeyStorageProtocol {
     }
 
     public func loadPrivateKey() throws -> Data {
-        guard let localPath = localPath else {
+        guard let localPath else {
             throw EthereumKeyStorageError.failedToLoad
         }
 
@@ -84,7 +84,7 @@ public class EthereumKeyLocalStorage: EthereumSingleKeyStorageProtocol {
 
 extension EthereumKeyLocalStorage: EthereumMultipleKeyStorageProtocol {
     public func fetchAccounts() throws -> [EthereumAddress] {
-        guard let folderPath = folderPath else {
+        guard let folderPath else {
             throw EthereumKeyStorageError.failedToLoad
         }
 
@@ -139,7 +139,7 @@ extension EthereumKeyLocalStorage: EthereumMultipleKeyStorageProtocol {
 
     public func deleteAllKeys() throws {
         do {
-            if let folderPath = folderPath {
+            if let folderPath {
                 let directoryContents = try fileManager.contentsOfDirectory(atPath: folderPath.path)
                 let addresses = directoryContents.filter({ $0.web3.isAddress || $0 == localFileName })
                 for address in addresses {
@@ -154,7 +154,7 @@ extension EthereumKeyLocalStorage: EthereumMultipleKeyStorageProtocol {
 
     public func deletePrivateKey(for address: EthereumAddress) throws {
         do {
-            if let folderPath = folderPath {
+            if let folderPath {
                 let filePathName = folderPath.appendingPathComponent(address.asString())
                 try fileManager.removeItem(at: filePathName)
             }

Sources/Web3Swift/Account/Signature.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  Signature.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Account/TypedData.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  TypedData.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -61,8 +61,8 @@ extension TypedData {
     // Whole data blob hash to sign
     public func signableHash() throws -> Data {
         var data = Data([0x19, 0x01])
-        data.append(try encodeData(data: domain, type: "EIP712Domain").web3.keccak256)
-        data.append(try encodeData(data: message, type: primaryType).web3.keccak256)
+        try data.append(encodeData(data: domain, type: "EIP712Domain").web3.keccak256)
+        try data.append(encodeData(data: message, type: primaryType).web3.keccak256)
         return data.web3.keccak256
     }
 

Sources/Web3Swift/Client/BaseEthereumClient+Call.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  BaseEthereumClient+Call.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -48,7 +48,7 @@ extension BaseEthereumClient {
             func encode(to encoder: Encoder) throws {
                 var container = encoder.unkeyedContainer()
                 var nested = container.nestedContainer(keyedBy: TransactionCodingKeys.self)
-                if let from = from {
+                if let from {
                     try nested.encode(from, forKey: .from)
                 }
                 try nested.encode(to, forKey: .to)
@@ -212,11 +212,11 @@ fileprivate extension OffchainReadError {
     var isNextURLAllowed: Bool {
         switch self {
         case let .server(code, _):
-            return code >= 500 // 4xx responses -> Don't continue with next url
+            code >= 500 // 4xx responses -> Don't continue with next url
         case .network, .invalidParams, .invalidResponse:
-            return true
+            true
         case .tooManyRedirections:
-            return false
+            false
         }
     }
 }

Sources/Web3Swift/Client/BaseEthereumClient.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  BaseEthereumClient.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -34,11 +34,11 @@ open class BaseEthereumClient: EthereumClientProtocol {
 
     func failureHandler(_ error: Error) -> EthereumClientError {
         if case let .executionError(result) = error as? JSONRPCError {
-            return EthereumClientError.executionError(result.error)
+            EthereumClientError.executionError(result.error)
         } else if case .executionError = error as? EthereumClientError, let error = error as? EthereumClientError {
-            return error
+            error
         } else {
-            return EthereumClientError.unexpectedReturnValue
+            EthereumClientError.unexpectedReturnValue
         }
     }
 }

Sources/Web3Swift/Client/HTTP/EthereumHttpClient.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumHttpClient.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumAddress.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumAddress.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumBlock.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumBlock.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -14,22 +14,22 @@ public enum EthereumBlock: Hashable {
     public var stringValue: String {
         switch self {
         case .Latest:
-            return "latest"
+            "latest"
         case .Earliest:
-            return "earliest"
+            "earliest"
         case .Pending:
-            return "pending"
+            "pending"
         case let .Number(int):
-            return int.web3.hexString
+            int.web3.hexString
         }
     }
 
     public var intValue: Int? {
         switch self {
         case let .Number(int):
-            return int
+            int
         default:
-            return nil
+            nil
         }
     }
 
@@ -71,21 +71,21 @@ extension EthereumBlock: Comparable {
     static public func < (lhs: EthereumBlock, rhs: EthereumBlock) -> Bool {
         switch lhs {
         case .Earliest:
-            return false
+            false
         case .Latest:
-            return rhs != .Pending ? true : false
+            rhs != .Pending ? true : false
         case .Pending:
-            return true
+            true
         case let .Number(lhsInt):
             switch rhs {
             case .Earliest:
-                return false
+                false
             case .Latest:
-                return true
+                true
             case .Pending:
-                return true
+                true
             case let .Number(rhsInt):
-                return lhsInt < rhsInt
+                lhsInt < rhsInt
             }
         }
     }

Sources/Web3Swift/Client/Models/EthereumBlockInfo.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumBlockInfo.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumHeader.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumHeader.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumLog.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumLog.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumNetwork.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumNetwork.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -12,33 +12,33 @@ public enum EthereumNetwork: Equatable, Decodable {
     public static func fromString(_ networkId: String) -> EthereumNetwork {
         switch networkId {
         case "1":
-            return .mainnet
+            .mainnet
         case "11155111":
-            return .sepolia
+            .sepolia
         default:
-            return .custom(networkId)
+            .custom(networkId)
         }
     }
 
     public var stringValue: String {
         switch self {
         case .mainnet:
-            return "1"
+            "1"
         case .sepolia:
-            return "11155111"
+            "11155111"
         case let .custom(str):
-            return str
+            str
         }
     }
 
     public var intValue: Int {
         switch self {
         case .mainnet:
-            return 1
+            1
         case .sepolia:
-            return 11155111
+            11155111
         case let .custom(str):
-            return Int(str) ?? 0
+            Int(str) ?? 0
         }
     }
 }

Sources/Web3Swift/Client/Models/EthereumSubscription.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumSubscription.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -14,13 +14,13 @@ public enum EthereumSubscriptionType: Equatable, Hashable {
     var params: [EthereumSubscriptionParamElement] {
         switch self {
         case .newBlockHeaders:
-            return [.method("newHeads")]
+            [.method("newHeads")]
         case let .logs(params):
-            return [.method("logs"), .logsParams(params ?? .init(address: nil, topics: nil))]
+            [.method("logs"), .logsParams(params ?? .init(address: nil, topics: nil))]
         case .newPendingTransactions:
-            return [.method("newPendingTransactions")]
+            [.method("newPendingTransactions")]
         case .syncing:
-            return [.method("syncing")]
+            [.method("syncing")]
         }
     }
 }

Sources/Web3Swift/Client/Models/EthereumSyncStatus.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumSyncStatus.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumTransaction.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumTransaction.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/Models/EthereumTransactionReceipt.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EthereumTransactionReceipt.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/NetworkProviders/EventLoopGroupProvider.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  EventLoopGroupProvider.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 

Sources/Web3Swift/Client/NetworkProviders/HttpNetworkProvider.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  HttpNetworkProvider.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -35,7 +35,7 @@ public class HttpNetworkProvider: NetworkProviderProtocol {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue("application/json", forHTTPHeaderField: "Accept")
 
-        headers.forEach { key, value in
+        for (key, value) in headers {
             request.addValue(value, forHTTPHeaderField: key)
         }
 

Sources/Web3Swift/Client/NetworkProviders/JSONRPC.swift

@@ -1,5 +1,5 @@
 //
-//  web3.swift
+//  JSONRPC.swift
 //  Copyright © 2022 Argent Labs Limited. All rights reserved.
 //
 
@@ -78,9 +78,9 @@ public enum JSONRPCError: Error {
     public var isExecutionError: Bool {
         switch self {
         case .executionError:
-            return true
+            true
         default:
-            return false
+            false
         }
     }
 }