Code cleaning & unnecessary changes revert.

Author: yaroslavyaroslav

Sources/web3swift/Promises/Promise+Web3+Eth+FeeHistory.swift

@@ -11,10 +11,6 @@ import PromiseKit
 import BigInt
 
 extension web3.Eth {
-//    public func feeHistory(blockCount: Int = 10, onBlock: String = "latest", percentiles:[Double] = [25, 50, 75]) -> Promise<FeeHistory> {
-//        return feeHistory(address: addr, onBlock: onBlock)
-//    }
-
     func feeHistory(blockCount: BigUInt, block: String, percentiles:[Double]) throws -> Web3.Oracle.FeeHistory {
         let request = JSONRPCRequestFabric.prepareRequest(.feeHistory, parameters: [blockCount.description.addHexPrefix(), block, percentiles])
         let rp = web3.dispatch(request)

Sources/web3swift/Web3/Web3+Eth.swift

@@ -351,4 +351,5 @@ extension web3.Eth {
         guard let value = Web3.Utils.parseToBigUInt(amount, decimals: intDecimals) else {return nil}
         return sendERC20tokensWithKnownDecimals(tokenAddress: tokenAddress, from: from, to: to, amount: value, transactionOptions: mergedOptions)
     }
+
 }

Sources/web3swift/Web3/Web3+ReadingTransaction.swift

@@ -90,8 +90,8 @@ public class ReadTransaction {
             let promise = self.web3.eth.estimateGasPromise(assembledTransaction, transactionOptions: optionsForGasEstimation)
             promise.done(on: queue) {(estimate: BigUInt) in
                 seal.fulfill(estimate)
-            }.catch(on: queue) {err in
-                seal.reject(err)
+                }.catch(on: queue) {err in
+                    seal.reject(err)
             }
         }
         return returnPromise

Sources/web3swift/Web3/Web3+WebsocketProvider.swift

@@ -30,23 +30,25 @@ public enum InfuraWebsocketMethod: String, Encodable {
     case unsubscribe = "eth_unsubscribe"
 
     public var requiredNumOfParameters: Int? {
-        switch self {
-        case .newPendingTransactionFilter:
-            return 0
-        case .getFilterChanges:
-            return 1
-        case .newFilter:
-            return nil
-        case .newBlockFilter:
-            return 0
-        case .getFilterLogs:
-            return nil
-        case .uninstallFilter:
-            return 1
-        case .subscribe:
-            return nil
-        case .unsubscribe:
-            return 1
+        get {
+            switch self {
+            case .newPendingTransactionFilter:
+                return 0
+            case .getFilterChanges:
+                return 1
+            case .newFilter:
+                return nil
+            case .newBlockFilter:
+                return 0
+            case .getFilterLogs:
+                return nil
+            case .uninstallFilter:
+                return 1
+            case .subscribe:
+                return nil
+            case .unsubscribe:
+                return 1
+            }
         }
     }
 }
@@ -73,11 +75,13 @@ public struct InfuraWebsocketRequest: Encodable {
     }
 
     public var isValid: Bool {
-        if self.method == nil {
-            return false
+        get {
+            if self.method == nil {
+                return false
+            }
+            guard let method = self.method else {return false}
+            return method.requiredNumOfParameters == self.params?.params.count
         }
-        guard let method = self.method else {return false}
-        return method.requiredNumOfParameters == self.params?.params.count
     }
 }
 

Tests/web3swiftTests/localTests/web3swiftBasicLocalNodeTests.swift

@@ -64,7 +64,7 @@ class web3swiftBasicLocalNodeTests: XCTestCase {
         let balanceBeforeFrom = try web3.eth.getBalancePromise(address: allAddresses[0]).wait()
         print("Balance before to: " + balanceBeforeTo.description)
         print("Balance before from: " + balanceBeforeFrom.description)
-
+        
         let result = try sendTx.sendPromise().wait()
         let txHash = result.hash
         print("Transaction with hash " + txHash)

Tests/web3swiftTests/localTests/web3swiftPromisesTests.swift

@@ -94,7 +94,7 @@ class web3swiftPromisesTests: XCTestCase {
         options.from = fromAddress
 
         let amount1 = Web3.Utils.parseToBigUInt("0.000000000000000001", units: .eth) // 1 wei
-
+        
         guard let tx1 = contract.write("test",
                                        parameters: [amount1] as [AnyObject],
                                        extraData: Data(),