Fixed one more test

Author: yaroslavyaroslav

Sources/Core/Transaction/EncodableTransaction.swift

@@ -55,8 +55,12 @@ public struct EncodableTransaction {
     }
 
     /// the native value of the transaction
-    public var value: BigUInt
+    public var value: BigUInt {
+        get { return envelope.value }
+        set { envelope.value = newValue }
+    }
 
+    // MARK: - Ruins signing and decoding tests if tied to envelop
     /// any additional data for the transaction
     public var data: Data
 
@@ -169,7 +173,7 @@ public struct EncodableTransaction {
     public init?(rawValue: Data) {
         guard let env = EnvelopeFactory.createEnvelope(rawValue: rawValue) else { return nil }
         self.envelope = env
-        value = 0
+        // FIXME: This is duplication and should be fixed.
         data = Data()
     }
 
@@ -216,7 +220,7 @@ extension EncodableTransaction: Codable {
     public init(from decoder: Decoder) throws {
         guard let env = try EnvelopeFactory.createEnvelope(from: decoder) else { throw Web3Error.dataError }
         self.envelope = env
-        value = 0
+        // FIXME: This is duplication and should be fixed.
         data = Data()
 
         // capture any metadata that might be present
@@ -289,10 +293,8 @@ extension EncodableTransaction {
     public init(type: TransactionType? = nil, to: EthereumAddress, nonce: BigUInt = 0,
                 chainID: BigUInt? = nil, value: BigUInt? = nil, data: Data = Data(),
                 v: BigUInt = 1, r: BigUInt = 0, s: BigUInt = 0) {
-
-        self.value = value ?? 0
+        // FIXME: This is duplication and should be fixed.
         self.data = data
-
         self.envelope = EnvelopeFactory.createEnvelope(type: type, to: to, nonce: nonce, v: v, r: r, s: s)
     }
 }

Tests/web3swiftTests/localTests/TransactionsTests.swift

@@ -598,14 +598,13 @@ class TransactionsTests: XCTestCase {
 
     func testDirectTransaction() throws {
         do {
-            var params = EncodableTransaction.emptyTransaction
-            params.gasPrice = 20000000000
-            params.gasLimit = 21000
             var transaction = EncodableTransaction(
                 to: EthereumAddress("0x3535353535353535353535353535353535353535")!,
-                nonce: 9, value: 1000000000000000000, data: Data(),
+                nonce: 9, value: 1_000_000_000_000_000_000, data: Data(),
                 // FIXME: Return parameters here
                 v: 0, r: 0, s: 0)
+            transaction.gasPrice = 20_000_000_000
+            transaction.gasLimit = 21_000
             let privateKeyData = Data.fromHex("0x4646464646464646464646464646464646464646464646464646464646464646")!
             let publicKey = Utilities.privateToPublic(privateKeyData, compressed: false)
             let sender = Utilities.publicToAddress(publicKey!)