refactor: change function to computed var

Author: scottphc

Sources/FlowSDK/Models/Transaction.swift

@@ -344,13 +344,12 @@ extension Transaction {
             signature: signature)
     }
 
-    public func payloadMessage() -> Data {
+    public var payloadMessage: Data {
         payloadRLPList.rlpData
     }
 
     public var encodedPayload: Data {
-        let payload = payloadMessage()
-        return DomainTag.transaction.rightPaddedData + payload
+        DomainTag.transaction.rightPaddedData + payloadMessage
     }
 
     public var payloadRLPList: RLPEncoableArray {
@@ -367,16 +366,15 @@ extension Transaction {
         ]
     }
 
-    /// Returns the signable message for the transaction envelope.
+    /// The signable message for the transaction envelope.
     ///
     /// This message is only signed by the payer account.
-    public func envelopeMessage() -> Data {
+    public var envelopeMessage: Data {
         envelopeRLPList.rlpData
     }
 
     public var encodedEnvelope: Data {
-        let envelope = envelopeMessage()
-        return DomainTag.transaction.rightPaddedData + envelope
+        DomainTag.transaction.rightPaddedData + envelopeMessage
     }
 
     private var envelopeRLPList: RLPEncoableArray {

Tests/FlowSDKTests/Models/TransactionTests.swift

@@ -426,8 +426,8 @@ final class TransactionTests: XCTestCase {
         let transaction = Transaction.makeBase()
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesCompleteTransactionWithEnvelopeSignature() throws {
@@ -439,8 +439,8 @@ final class TransactionTests: XCTestCase {
             signature: Data(hex: "f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesEmptyScript() throws {
@@ -449,8 +449,8 @@ final class TransactionTests: XCTestCase {
         transaction.script = Data()
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f84280c0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f869f84280c0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f84280c0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f869f84280c0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesEmptyReferenceBlock() throws {
@@ -459,8 +459,8 @@ final class TransactionTests: XCTestCase {
         transaction.referenceBlockId = .empty
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a000000000000000000000000000000000000000000000000000000000000000002a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a000000000000000000000000000000000000000000000000000000000000000002a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a000000000000000000000000000000000000000000000000000000000000000002a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a000000000000000000000000000000000000000000000000000000000000000002a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesZeroGasLimit() throws {
@@ -469,8 +469,8 @@ final class TransactionTests: XCTestCase {
         transaction.gasLimit = 0
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b80880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b80880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b80880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b80880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesEmptyProposalKeyId() throws {
@@ -482,8 +482,8 @@ final class TransactionTests: XCTestCase {
             sequenceNumber: 10)
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001800a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001800a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001800a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001800a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesEmptySequenceNumber() throws {
@@ -495,8 +495,8 @@ final class TransactionTests: XCTestCase {
             sequenceNumber: 0)
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8800000000000000010480880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8800000000000000010480880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8800000000000000010480880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f899f872b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a8800000000000000010480880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesMultipleAuthorizers() throws {
@@ -505,8 +505,8 @@ final class TransactionTests: XCTestCase {
         transaction.addAuthorizer(address: Address(hexString: "02"))
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f87bb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001d2880000000000000001880000000000000002"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f8a2f87bb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001d2880000000000000001880000000000000002e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f87bb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001d2880000000000000001880000000000000002"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f8a2f87bb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207dc0a0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001d2880000000000000001880000000000000002e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesSingleArgument() throws {
@@ -515,8 +515,8 @@ final class TransactionTests: XCTestCase {
         transaction.addRawArgument(try JSONEncoder().encode(Cadence.Argument.string("foo")))
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f892b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207de09f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f8b9f892b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207de09f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f892b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207de09f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f8b9f892b07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207de09f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPMessagesMultipleArguments() throws {
@@ -526,8 +526,8 @@ final class TransactionTests: XCTestCase {
         transaction.addRawArgument(try JSONEncoder().encode(Cadence.Argument.int(42)))
 
         // Assert
-        XCTAssertEqual(transaction.payloadMessage(), Data(hex: "f8afb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207df83c9f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227d9b7b2274797065223a22496e74222c2276616c7565223a223432227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
-        XCTAssertEqual(transaction.envelopeMessage(), Data(hex: "f8d6f8afb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207df83c9f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227d9b7b2274797065223a22496e74222c2276616c7565223a223432227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
+        XCTAssertEqual(transaction.payloadMessage, Data(hex: "f8afb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207df83c9f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227d9b7b2274797065223a22496e74222c2276616c7565223a223432227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001"))
+        XCTAssertEqual(transaction.envelopeMessage, Data(hex: "f8d6f8afb07472616e73616374696f6e207b2065786563757465207b206c6f67282248656c6c6f2c20576f726c64212229207d207df83c9f7b2274797065223a22537472696e67222c2276616c7565223a22666f6f227d9b7b2274797065223a22496e74222c2276616c7565223a223432227da0f0e4c2f76c58916ec258f246851bea091d14d4247a2fc3e18694461b1816e13b2a880000000000000001040a880000000000000001c9880000000000000001e4e38004a0f7225388c1d69d57e6251c9fda50cbbf9e05131e5adb81e5aa0422402f048162"))
     }
 
     func testRLPEncodeAndDecode() throws {