Rename deleted methods in tests and BrowserFunctions to new one.

Temporary disabled tests that requires temporary deleted methods.

Author: yaroslavyaroslav

Sources/web3swift/API/APIMethod.swift

@@ -13,6 +13,7 @@ public typealias Receipt = Hash
 public typealias Address = Hash // 20 bytes (40 chars length without 0x)
 public typealias TransactionHash = Hash // 64 chars length without 0x
 
+// FIXME: Add documentation to each method.
 /// Ethereum JSON RPC API Calls
 public enum APIRequest {
     // MARK: - Official API
@@ -91,7 +92,7 @@ public enum APIRequest {
 extension Data: APIResultType { }
 
 extension APIRequest {
-    public var method: REST {
+    var method: REST {
         switch self {
         default: return .POST
         }
@@ -266,7 +267,7 @@ extension APIRequest {
     }
 }
 
-public enum REST: String {
+enum REST: String {
     case POST
     case GET
 }

Sources/web3swift/API/APIRequestParameter.swift

@@ -15,7 +15,6 @@ import Foundation
 /// Please see `RequestParameter` documentation for more details.
 protocol APIRequestParameterType: Encodable { }
 
-protocol APIRequestParameterElementType: Encodable { }
 
 extension Int: APIRequestParameterType { }
 
@@ -29,6 +28,9 @@ extension Bool: APIRequestParameterType { }
 
 extension Array: APIRequestParameterType where Element: APIRequestParameterElementType { }
 
+
+protocol APIRequestParameterElementType: Encodable { }
+
 extension TransactionParameters: APIRequestParameterType { }
 
 extension EventFilterParameters: APIRequestParameterType { }

Sources/web3swift/API/HexDecodableProtocols.swift

@@ -46,12 +46,6 @@ extension BigInt: LiteralInitiableFromString { }
 
 extension BigUInt: LiteralInitiableFromString { }
 
-// This don't work without each other.
-//extension LiteralInitiableFromString {
-//    public init?(from hexString: String) { return nil }
-//}
-//extension Array: LiteralInitiableFromString where Element: LiteralInitiableFromString { }
-
 public protocol IntegerInitableWithRadix {
     init?<S: StringProtocol>(_ text: S, radix: Int)
 }

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -11,7 +11,7 @@ extension web3.BrowserFunctions {
 
     public func getAccounts() async -> [String]? {
         do {
-            let accounts = try await self.web3.eth.getAccounts()
+            let accounts = try await self.web3.eth.ownedAccounts()
             return accounts.compactMap({$0.address})
         } catch {
             return [String]()
@@ -86,7 +86,7 @@ extension web3.BrowserFunctions {
 
     public func sendTransaction(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions, password: String = "web3swift") async -> [String: Any]? {
         do {
-            let result = try await self.web3.eth.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
+            let result = try await self.web3.eth.send(transaction, transactionOptions: transactionOptions, password: password)
             return ["txhash": result.hash]
         } catch {
             return nil
@@ -110,7 +110,7 @@ extension web3.BrowserFunctions {
 
     public func estimateGas(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions) async -> BigUInt? {
         do {
-            let result = try await self.web3.eth.estimateGas(transaction, transactionOptions: transactionOptions)
+            let result = try await self.web3.eth.estimateGas(for: transaction, transactionOptions: transactionOptions)
             return result
         } catch {
             return nil
@@ -133,7 +133,7 @@ extension web3.BrowserFunctions {
             var transaction = trans
             var options = opts
             guard let _ = options.from else {return (nil, nil)}
-            let gasPrice = try await self.web3.eth.getGasPrice()
+            let gasPrice = try await self.web3.eth.gasPrice()
             transaction.parameters.gasPrice = gasPrice
             options.gasPrice = .manual(gasPrice)
             guard let gasEstimate = await self.estimateGas(transaction, transactionOptions: options) else {return (nil, nil)}
@@ -179,15 +179,15 @@ extension web3.BrowserFunctions {
             case .manual(let gasPrice):
                 transaction.parameters.gasPrice = gasPrice
             default:
-                let gasPrice = try await self.web3.eth.getGasPrice()
+                let gasPrice = try await self.web3.eth.gasPrice()
                 transaction.parameters.gasPrice = gasPrice
             }
 
             switch gasLimitPolicy {
             case .manual(let gasLimit):
                 transaction.parameters.gasLimit = gasLimit
             default:
-                let gasLimit = try await self.web3.eth.estimateGas(transaction, transactionOptions: transactionOptions)
+                let gasLimit = try await self.web3.eth.estimateGas(for: transaction, transactionOptions: transactionOptions)
                 transaction.parameters.gasLimit = gasLimit
             }
 

Sources/web3swift/Web3/Web3+GasOracle.swift

@@ -124,7 +124,7 @@ extension Web3 {
         private func suggestGasFeeLegacy() async throws -> [BigUInt] {
             var latestBlockNumber: BigUInt = 0
             switch block {
-            case .latest: latestBlockNumber = try await eth.getBlockNumber()
+            case .latest: latestBlockNumber = try await eth.blockNumber()
             case let .exact(number): latestBlockNumber = number
             // FIXME: Make real error here
                 // Error throws since pending and erliest are unable to be used in this method.

Tests/web3swiftTests/localTests/LocalTestCase.swift

@@ -20,12 +20,12 @@ class LocalTestCase: XCTestCase {
 
             let web3 = try! await Web3.new(LocalTestCase.url)
 
-            let block = try! await web3.eth.getBlockNumber()
+            let block = try! await web3.eth.blockNumber()
             if block >= 25 { return }
 
             print("\n ****** Preloading Ganache (\(25 - block) blocks) *****\n")
 
-            let allAddresses = try! await web3.eth.getAccounts()
+            let allAddresses = try! await web3.eth.ownedAccounts()
             let sendToAddress = allAddresses[0]
             let contract = web3.contract(Web3.Utils.coldWalletABI, at: sendToAddress, abiVersion: 2)
             let value = Web3.Utils.parseToBigUInt("1.0", units: .eth)