chore: general cleanup (#679)

Author: pharms-eth

Sources/Core/EthereumNetwork/Request/APIRequest+ComputedProperties.swift

@@ -9,13 +9,11 @@ import Foundation
 
 extension APIRequest {
     var method: REST {
-        switch self {
-        default: return .POST
-        }
+         .POST
     }
 
    public var encodedBody: Data {
-        let request = RequestBody(method: self.call, params: self.parameters)
+        let request = RequestBody(method: call, params: parameters)
         // this is safe to force try this here
         // Because request must failed to compile if it not conformable with `Encodable` protocol
         return try! JSONEncoder().encode(request)

Sources/Core/KeystoreManager/KeystoreManager.swift

@@ -42,9 +42,11 @@ public class KeystoreManager: AbstractKeystore {
     }
 
     public func UNSAFE_getPrivateKeyData(password: String, account: EthereumAddress) throws -> Data {
-        guard let keystore = self.walletForAddress(account) else {throw AbstractKeystoreError.invalidAccountError}
-                    return try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
-                }
+        guard let keystore = walletForAddress(account) else {
+            throw AbstractKeystoreError.invalidAccountError
+        }
+        return try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
+    }
 
     public static var allManagers = [KeystoreManager]()
     public static var defaultManager: KeystoreManager? {

Sources/Core/Transaction/Envelope/EIP1559Envelope.swift

@@ -249,8 +249,10 @@ extension EIP1559Envelope {
         let list = accessList.map { $0.encodeAsList() as AnyObject }
 
         switch type {
-        case .transaction: fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
-        case .signature: fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list] as [AnyObject]
+        case .transaction:
+            fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
+        case .signature:
+            fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list] as [AnyObject]
         }
         guard var result = RLP.encode(fields) else { return nil }
         result.insert(UInt8(self.type.rawValue), at: 0)

Sources/Core/Transaction/Envelope/EIP2930Envelope.swift

@@ -210,8 +210,10 @@ extension EIP2930Envelope {
         let list = accessList.map { $0.encodeAsList() as AnyObject }
 
         switch type {
-        case .transaction: fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
-        case .signature: fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list] as [AnyObject]
+        case .transaction:
+            fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
+        case .signature:
+            fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list] as [AnyObject]
         }
         guard var result = RLP.encode(fields) else { return nil }
         result.insert(UInt8(self.type.rawValue), at: 0)

Sources/Core/Transaction/Envelope/LegacyEnvelope.swift

@@ -194,12 +194,13 @@ extension LegacyEnvelope {
     public func encode(for type: EncodeType = .transaction) -> Data? {
         let fields: [AnyObject]
         switch type {
-        case .transaction: fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, v, r, s] as [AnyObject]
+        case .transaction:
+            fields = [nonce, gasPrice, gasLimit, to.addressData, value, data, v, r, s] as [AnyObject]
         case .signature:
-            if let chainID = self.chainID, chainID != 0 {
-                fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, chainID, BigUInt(0), BigUInt(0)] as [AnyObject]
+            if let chainID = chainID, chainID != 0 {
+                fields = [nonce, gasPrice, gasLimit, to.addressData, value, data, chainID, BigUInt(0), BigUInt(0)] as [AnyObject]
             } else {
-                fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data] as [AnyObject]
+                fields = [nonce, gasPrice, gasLimit, to.addressData, value, data] as [AnyObject]
             }
         }
         return RLP.encode(fields)

Sources/Core/Utility/Utilities.swift

@@ -1,6 +1,6 @@
 //
 //  Utilities.swift
-//  
+//
 //
 //  Created by Yaroslav Yashin on 11.07.2022.
 //
@@ -144,12 +144,12 @@ public struct Utilities {
         }
         let divisor = BigUInt(10).power(unitDecimals)
         let (quotient, remainder) = bigNumber.quotientAndRemainder(dividingBy: divisor)
-        var fullRemainder = String(remainder)
+        var fullRemainder = "\(remainder)"
         let fullPaddedRemainder = fullRemainder.leftPadding(toLength: unitDecimals, withPad: "0")
         let remainderPadded = fullPaddedRemainder[0..<toDecimals]
         if remainderPadded == String(repeating: "0", count: toDecimals) {
             if quotient != 0 {
-                return String(quotient)
+                return "\(quotient)"
             } else if fallbackToScientific {
                 var firstDigit = 0
                 for char in fullPaddedRemainder {
@@ -180,9 +180,9 @@ public struct Utilities {
             }
         }
         if toDecimals == 0 {
-            return String(quotient)
+            return "\(quotient)"
         }
-        return String(quotient) + decimalSeparator + remainderPadded
+        return "\(quotient)" + decimalSeparator + remainderPadded
     }
 
     /// Recover the Ethereum address from recoverable secp256k1 signature. Message is first hashed using the "personal hash" protocol.

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+GetBlockByHash.swift

@@ -9,7 +9,7 @@ import Core
 
 extension Web3.Eth {
     public func block(by hash: Data, fullTransactions: Bool = false) async throws -> Block {
-        let request = APIRequest.getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
+        let request: APIRequest = .getBlockByHash(hash.toHexString().addHexPrefix(), fullTransactions)
         return try await APIRequest.sendRequest(with: provider, for: request).result
     }
 }

Sources/web3swift/Operations/ReadOperation.swift

@@ -36,6 +36,7 @@ public class ReadOperation {
 
     // TODO: Remove type erasing here, some broad wide protocol should be added instead
     public func callContractMethod() async throws -> [String: Any] {
+
         // MARK: Read data from ABI flow
         // FIXME: This should be dropped, and after `execute()` call, just to decode raw data.
         let data: Data = try await self.web3.eth.callTransaction(transaction)

Sources/web3swift/Web3/Web3.swift

@@ -12,9 +12,9 @@ extension Web3 {
 
     /// Initialized provider-bound Web3 instance using a provider's URL. Under the hood it performs a synchronous call to get
     /// the Network ID for EIP155 purposes
-    public static func new(_ providerURL: URL) async throws -> Web3 {
+    public static func new(_ providerURL: URL, network: Networks = .Mainnet) async throws -> Web3 {
         // FIXME: Change this hardcoded value to dynamicly fethed from a Node
-        guard let provider = await Web3HttpProvider(providerURL, network: .Mainnet) else {
+        guard let provider = await Web3HttpProvider(providerURL, network: network) else {
             throw Web3Error.inputError(desc: "Wrong provider - should be Web3HttpProvider with endpoint scheme http or https")
         }
         return Web3(provider: provider)

Tests/web3swiftTests/localTests/LocalTestCase.swift

@@ -15,8 +15,8 @@ class LocalTestCase: XCTestCase {
     override func setUp() async throws {
         let web3 = try! await Web3.new(LocalTestCase.url)
 
-        let block = try! await web3.eth.blockNumber()
-        if block >= 25 { return }
+        let block = try await web3.eth.blockNumber()
+        guard block < 25 else { return }
 
         print("\n ****** Preloading Ganache (\(25 - block) blocks) *****\n")