Merge pull request #605 from JeneaVranceanu/fix/warnings

Author: yaroslavyaroslav

Sources/Core/Transaction/EthereumTransaction.swift

@@ -178,7 +178,7 @@ public struct EthereumTransaction: CustomStringConvertible {
     public func encodeAsDictionary(from: EthereumAddress? = nil) -> TransactionParameters? { self.envelope.encodeAsDictionary(from: from) }
 
     /// - Returns: a raw bytestream of the transaction, encoded according to the transactionType
-    func encode(for type: EncodeType = .transaction) -> Data? {
+    public func encode(for type: EncodeType = .transaction) -> Data? {
         return self.envelope.encode(for: type)
     }
 }
@@ -399,8 +399,7 @@ extension EthereumTransaction {
 
     @available(*, deprecated, message: "use encode() instead")
     public func encode(forSignature: Bool = false, chainID: BigUInt? = nil) -> Data? {
-        if forSignature == true { return self.envelope.encode(for: .signature) }
-        return self.envelope.encode(for: .transaction)
+        envelope.encode(for: forSignature ? .signature : .transaction)
     }
 
     @available(*, deprecated, message: "use Decodable instead")

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

@@ -17,7 +17,7 @@ extension web3.Eth {
     }
 
     public func send(raw transaction: EthereumTransaction) async throws -> TransactionSendingResult {
-        guard let transactionHexData = transaction.encode()?.toHexString().addHexPrefix() else { throw Web3Error.dataError }
+        guard let transactionHexData = transaction.encode(for: .transaction)?.toHexString().addHexPrefix() else { throw Web3Error.dataError }
         let request: APIRequest = .sendRawTransaction(transactionHexData)
         let response: APIResponse<Hash> = try await APIRequest.sendRequest(with: self.provider, for: request)
 

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -207,7 +207,7 @@ extension web3.BrowserFunctions {
             guard let keystore = keystoreManager.walletForAddress(from) else {return nil}
             try Web3Signer.signTX(transaction: &transaction, keystore: keystore, account: from, password: password)
             print(transaction)
-            let signedData = transaction.encode()?.toHexString().addHexPrefix()
+            let signedData = transaction.encode(for: .transaction)?.toHexString().addHexPrefix()
             return signedData
         } catch {
             return nil

Tests/web3swiftTests/localTests/LocalTests.xctestplan

@@ -235,7 +235,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")
@@ -304,7 +304,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")
@@ -373,7 +373,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")
@@ -442,7 +442,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")
@@ -511,7 +511,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")
@@ -580,7 +580,7 @@ class TransactionsTests: XCTestCase {
 
             // now sign the transaction with the private key
             try jsonTxn.sign(privateKey: privateKeyData, useExtraEntropy: false)
-            let rawTxn = jsonTxn.encode()!.toHexString().addHexPrefix()
+            let rawTxn = jsonTxn.encode(for: .transaction)!.toHexString().addHexPrefix()
 
             // check the hash, if they match everything was parsed, and re-encoded correctly
             XCTAssertEqual(rawTxn, vector.RLP, "Transaction Encoding Mismatch")