more promise renaming

Author: pharms-eth

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

@@ -9,7 +9,7 @@ import Foundation
 
 extension web3.Eth {
 
-    public func callPromise(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions?) async throws -> Data {
+    public func callTransaction(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions?) async throws -> Data {
         guard let request = EthereumTransaction.createRequest(method: .call, transaction: transaction, transactionOptions: transactionOptions) else {
             throw Web3Error.processingError(desc: "Transaction is invalid")
         }

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

@@ -10,7 +10,7 @@ import BigInt
 
 extension web3.Eth {
 
-    public func estimateGasPromise(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions?) async throws -> BigUInt {
+    public func estimateGas(for transaction: EthereumTransaction, transactionOptions: TransactionOptions?) async throws -> BigUInt {
 
         guard let request = EthereumTransaction.createRequest(method: .estimateGas, transaction: transaction, transactionOptions: transactionOptions) else {
             throw Web3Error.processingError(desc: "Transaction is invalid")

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

@@ -9,7 +9,7 @@ import BigInt
 
 
 extension web3.Eth {
-    public func getBlockNumberPromise() async throws -> BigUInt {
+    public func blockNumber() async throws -> BigUInt {
         let request = JSONRPCRequestFabric.prepareRequest(.blockNumber, parameters: [])
         let response = try await web3.dispatch(request)
 

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

@@ -9,7 +9,7 @@ import BigInt
 
 
 extension web3.Eth {
-    public func getGasPricePromise() async throws -> BigUInt {
+    public func gasPrice() async throws -> BigUInt {
         let request = JSONRPCRequestFabric.prepareRequest(.gasPrice, parameters: [])
         let response = try await web3.dispatch(request)
 

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

@@ -10,7 +10,7 @@ import BigInt
 
 extension web3.Eth {
 
-    public func sendTransactionPromise(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions? = nil, password: String = "web3swift") async throws -> TransactionSendingResult {
+    public func send(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions? = nil, password: String = "web3swift") async throws -> TransactionSendingResult {
         //  print(transaction)
         var assembledTransaction: EthereumTransaction = transaction
 

Sources/web3swift/Promises/Promise+Web3+Personal+CreateAccount.swift

@@ -9,7 +9,7 @@ import BigInt
 
 
 extension web3.Personal {
-    public func createAccountPromise(password: String = "web3swift") async throws -> EthereumAddress {
+    public func createAccount(password: String = "web3swift") async throws -> EthereumAddress {
 
         guard self.web3.provider.attachedKeystoreManager == nil else {
             throw Web3Error.inputError(desc: "Creating account in a local keystore with this method is not supported")

Sources/web3swift/Promises/Promise+Web3+Personal+Sign.swift

@@ -10,7 +10,7 @@ import BigInt
 
 extension web3.Personal {
 
-    public func signPersonalMessagePromise(message: Data, from: EthereumAddress, password: String = "web3swift") async throws -> Data {
+    public func signPersonal(message: Data, from: EthereumAddress, password: String = "web3swift") async throws -> Data {
 
         guard let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager else {
             let hexData = message.toHexString().addHexPrefix()

Sources/web3swift/Promises/Promise+Web3+Personal+UnlockAccount.swift

@@ -9,12 +9,12 @@ import BigInt
 
 
 extension web3.Personal {
-    public func unlockAccountPromise(account: EthereumAddress, password: String = "web3swift", seconds: UInt64 = 300) async throws -> Bool {
+    public func unlock(account: EthereumAddress, password: String = "web3swift", seconds: UInt64 = 300) async throws -> Bool {
         let addr = account.address
-        return try await unlockAccountPromise(account: addr, password: password, seconds: seconds)
+        return try await unlock(account: addr, password: password, seconds: seconds)
     }
 
-    public func unlockAccountPromise(account: String, password: String = "web3swift", seconds: UInt64 = 300) async throws -> Bool {
+    public func unlock(account: String, password: String = "web3swift", seconds: UInt64 = 300) async throws -> Bool {
 
         guard self.web3.provider.attachedKeystoreManager == nil else {
             throw Web3Error.inputError(desc: "Can not unlock a local keystore")

Sources/web3swift/Web3/Web3+Eth.swift

@@ -19,7 +19,7 @@ extension web3.Eth {
     ///
     /// Returns the Result object that indicates either success of failure.
     public func sendTransaction(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions, password: String = "web3swift") async throws -> TransactionSendingResult {
-        let result = try await self.sendTransactionPromise(transaction, transactionOptions: transactionOptions, password: password)
+        let result = try await self.send(transaction, transactionOptions: transactionOptions, password: password)
         return result
     }
 
@@ -35,7 +35,7 @@ extension web3.Eth {
     ///
     /// Returns the Result object that indicates either success of failure.
     func call(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions) async throws -> Data {
-        let result = try await self.callPromise(transaction, transactionOptions: transactionOptions)
+        let result = try await self.callTransaction(transaction, transactionOptions: transactionOptions)
         return result
     }
 
@@ -91,7 +91,7 @@ extension web3.Eth {
     ///
     /// Returns the Result object that indicates either success of failure.
     public func getBlockNumber() async throws -> BigUInt {
-        let result = try await self.getBlockNumberPromise()
+        let result = try await self.blockNumber()
         return result
     }
 
@@ -101,7 +101,7 @@ extension web3.Eth {
     ///
     /// Returns the Result object that indicates either success of failure.
     public func getGasPrice() async throws -> BigUInt {
-        let result = try await self.getGasPricePromise()
+        let result = try await self.gasPrice()
         return result
     }
 
@@ -162,7 +162,7 @@ extension web3.Eth {
     /// Error can also indicate that transaction is invalid in the current state, so formally it's gas limit is infinite.
     /// An example of such transaction can be sending an amount of ETH that is larger than the current account balance.
     public func estimateGas(_ transaction: EthereumTransaction, transactionOptions: TransactionOptions?) async throws -> BigUInt {
-        let result = try await self.estimateGasPromise(transaction, transactionOptions: transactionOptions)
+        let result = try await self.estimateGas(for: transaction, transactionOptions: transactionOptions)
         return result
     }
 

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -131,7 +131,7 @@ public class WriteTransaction: ReadTransaction {
         var cleanedOptions = TransactionOptions()
         cleanedOptions.from = mergedOptions.from
         cleanedOptions.to = mergedOptions.to
-        return try await self.web3.eth.sendTransactionPromise(transaction, transactionOptions: cleanedOptions, password: password)
+        return try await self.web3.eth.send(transaction, transactionOptions: cleanedOptions, password: password)
     }
 
     public func send(password: String = "web3swift", transactionOptions: TransactionOptions? = nil) async throws -> TransactionSendingResult {
@@ -146,7 +146,7 @@ public class WriteTransaction: ReadTransaction {
                      , assembledTransaction: EthereumTransaction, optionsForGasEstimation: TransactionOptions) async throws -> BigUInt {
         switch policy {
         case .automatic, .withMargin, .limited:
-            return try await self.web3.eth.estimateGasPromise(assembledTransaction, transactionOptions: optionsForGasEstimation)
+            return try await self.web3.eth.estimateGas(for: assembledTransaction, transactionOptions: optionsForGasEstimation)
         case .manual(let gasLimit):
             return gasLimit
         }
@@ -166,7 +166,7 @@ public class WriteTransaction: ReadTransaction {
     func gasPrice(for policy:  TransactionOptions.GasPricePolicy) async throws -> BigUInt {
         switch policy {
         case .automatic, .withMargin:
-            return try await self.web3.eth.getGasPricePromise()
+            return try await self.web3.eth.gasPrice()
         case .manual(let gasPrice):
             return gasPrice
         }