diff --git a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp index 45ec0adb1a..7e172796ea 100644 --- a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp @@ -32,7 +32,8 @@ VaultDelete::preflight(PreflightContext const& ctx) return temDISABLED; // The sfMemoData field is an optional field used to record the deletion reason. - if (auto const data = ctx.tx[~sfMemoData]; data && !validDataLength(data, maxDataPayloadLength)) + if (auto const data = ctx.tx[~sfMemoData]; + data && !validDataLength(data, kMaxDataPayloadLength)) return temMALFORMED; return tesSUCCESS; diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp index aea143e00c..aeb27f3dc2 100644 --- a/src/test/app/Vault_test.cpp +++ b/src/test/app/Vault_test.cpp @@ -7845,8 +7845,8 @@ class Vault_test : public beast::unit_test::Suite { testcase("VaultDelete data featureLendingProtocolV1_1 disabled"); env.disableFeature(featureLendingProtocolV1_1); - delTx[sfMemoData] = strHex(std::string(maxDataPayloadLength, 'A')); - env(delTx, ter(temDISABLED)); + delTx[sfMemoData] = strHex(std::string(kMaxDataPayloadLength, 'A')); + env(delTx, Ter(temDISABLED)); env.close(); env.enableFeature(featureLendingProtocolV1_1); } @@ -7854,8 +7854,8 @@ class Vault_test : public beast::unit_test::Suite // Transaction fails if the data field is too large { testcase("VaultDelete data featureLendingProtocolV1_1 enabled data too large"); - delTx[sfMemoData] = strHex(std::string(maxDataPayloadLength + 1, 'A')); - env(delTx, ter(temMALFORMED)); + delTx[sfMemoData] = strHex(std::string(kMaxDataPayloadLength + 1, 'A')); + env(delTx, Ter(temMALFORMED)); env.close(); } @@ -7863,7 +7863,7 @@ class Vault_test : public beast::unit_test::Suite { testcase("VaultDelete data featureLendingProtocolV1_1 enabled data empty"); delTx[sfMemoData] = strHex(std::string(0, 'A')); - env(delTx, ter(temMALFORMED)); + env(delTx, Ter(temMALFORMED)); env.close(); } @@ -7871,12 +7871,12 @@ class Vault_test : public beast::unit_test::Suite testcase("VaultDelete data featureLendingProtocolV1_1 enabled data valid"); PrettyAsset const xrpAsset = xrpIssue(); auto [tx, keylet] = vault.create({.owner = owner, .asset = xrpAsset}); - env(tx, ter(tesSUCCESS)); + env(tx, Ter(tesSUCCESS)); env.close(); // Recreate the transaction as the vault keylet changed auto delTx = vault.del({.owner = owner, .id = keylet.key}); - delTx[sfMemoData] = strHex(std::string(maxDataPayloadLength, 'A')); - env(delTx, ter(tesSUCCESS)); + delTx[sfMemoData] = strHex(std::string(kMaxDataPayloadLength, 'A')); + env(delTx, Ter(tesSUCCESS)); env.close(); } } diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp index 8d03aff9cb..48f7ff2a83 100644 --- a/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp +++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp @@ -1,15 +1,13 @@ // Auto-generated unit tests for transaction VaultDelete - -#include - -#include - +#include #include #include -#include -#include #include +#include + +#include +#include #include @@ -32,12 +30,7 @@ TEST(TransactionsVaultDeleteTests, BuilderSettersRoundTrip) auto const vaultIDValue = canonical_UINT256(); auto const memoDataValue = canonical_VL(); - VaultDeleteBuilder builder{ - accountValue, - vaultIDValue, - sequenceValue, - feeValue - }; + VaultDeleteBuilder builder{accountValue, vaultIDValue, sequenceValue, feeValue}; // Set optional fields builder.setMemoData(memoDataValue); @@ -71,7 +64,6 @@ TEST(TransactionsVaultDeleteTests, BuilderSettersRoundTrip) expectEqualField(expected, *actualOpt, "sfMemoData"); EXPECT_TRUE(tx.hasMemoData()); } - } // 2 & 4) Start from an STTx, construct a builder from it, build a new wrapper, @@ -92,12 +84,7 @@ TEST(TransactionsVaultDeleteTests, BuilderFromStTxRoundTrip) auto const memoDataValue = canonical_VL(); // Build an initial transaction - VaultDeleteBuilder initialBuilder{ - accountValue, - vaultIDValue, - sequenceValue, - feeValue - }; + VaultDeleteBuilder initialBuilder{accountValue, vaultIDValue, sequenceValue, feeValue}; initialBuilder.setMemoData(memoDataValue); @@ -130,15 +117,13 @@ TEST(TransactionsVaultDeleteTests, BuilderFromStTxRoundTrip) ASSERT_TRUE(actualOpt.has_value()) << "Optional field sfMemoData should be present"; expectEqualField(expected, *actualOpt, "sfMemoData"); } - } // 3) Verify wrapper throws when constructed from wrong transaction type. TEST(TransactionsVaultDeleteTests, WrapperThrowsOnWrongTxType) { // Build a valid transaction of a different type - auto const [pk, sk] = - generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType")); + auto const [pk, sk] = generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType")); auto const account = calcAccountID(pk); AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()}; @@ -151,8 +136,7 @@ TEST(TransactionsVaultDeleteTests, WrapperThrowsOnWrongTxType) TEST(TransactionsVaultDeleteTests, BuilderThrowsOnWrongTxType) { // Build a valid transaction of a different type - auto const [pk, sk] = - generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder")); + auto const [pk, sk] = generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder")); auto const account = calcAccountID(pk); AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()}; @@ -166,7 +150,7 @@ TEST(TransactionsVaultDeleteTests, OptionalFieldsReturnNullopt) { // Generate a deterministic keypair for signing auto const [publicKey, secretKey] = - generateKeyPair(KeyType::secp256k1, generateSeed("testVaultDeleteNullopt")); + generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultDeleteNullopt")); // Common transaction fields auto const accountValue = calcAccountID(publicKey); @@ -176,12 +160,7 @@ TEST(TransactionsVaultDeleteTests, OptionalFieldsReturnNullopt) // Transaction-specific required field values auto const vaultIDValue = canonical_UINT256(); - VaultDeleteBuilder builder{ - accountValue, - vaultIDValue, - sequenceValue, - feeValue - }; + VaultDeleteBuilder builder{accountValue, vaultIDValue, sequenceValue, feeValue}; // Do NOT set optional fields @@ -192,4 +171,4 @@ TEST(TransactionsVaultDeleteTests, OptionalFieldsReturnNullopt) EXPECT_FALSE(tx.getMemoData().has_value()); } -} +} // namespace xrpl::transactions