ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-04 11:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: clang-tidy auto fixes (#1868)

Browse Source 
Fixes #1867. Please review and commit clang-tidy fixes.

Co-authored-by: kuznetsss <15742918+kuznetsss@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2025-02-03 08:43:26 +00:00
committed by GitHub
parent 89af8fe500
commit 2fd16cd582
2 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/common/util/TestObject.cpp
View File

@@ -761,7 +761,7 @@ createMintNftTxWithMetadataOfCreatedNode(
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
ripple::STObject newFields(ripple::sfNewFields);
ripple::STArray NFTArray1{1};
ripple::STArray nftArray1{1};
if (nftID) {
// finalFields contain new NFT while previousFields does not
@@ -770,9 +770,9 @@ createMintNftTxWithMetadataOfCreatedNode(
if (uri)
entry.setFieldVL(ripple::sfURI, ripple::Slice(uri->data(), uri->size()));
NFTArray1.push_back(entry);
nftArray1.push_back(entry);
}
newFields.setFieldArray(ripple::sfNFTokens, NFTArray1);
newFields.setFieldArray(ripple::sfNFTokens, nftArray1);
node.emplace_back(std::move(newFields));
if (pageIndex)
node.setFieldH256(ripple::sfLedgerIndex, ripple::uint256{*pageIndex});
@@ -820,26 +820,26 @@ createNftModifyTxWithMetadata(std::string_view accountId, std::string_view nftID
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
ripple::STObject finalFields(ripple::sfFinalFields);
ripple::STArray NFTArray1{1};
ripple::STArray NFTArray2{1};
ripple::STArray nftArray1{1};
ripple::STArray nftArray2{1};
// finalFields contain new NFT while previousFields does not
auto entry = ripple::STObject(ripple::sfNFToken);
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
if (!uri.empty())
entry.setFieldVL(ripple::sfURI, uri);
NFTArray1.push_back(entry);
nftArray1.push_back(entry);
auto entry2 = ripple::STObject(ripple::sfNFToken);
entry2.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
char const* url = "previous";
entry2.setFieldVL(ripple::sfURI, ripple::Slice(url, 7));
NFTArray2.push_back(entry2);
nftArray2.push_back(entry2);
finalFields.setFieldArray(ripple::sfNFTokens, NFTArray1);
finalFields.setFieldArray(ripple::sfNFTokens, nftArray1);
ripple::STObject previousFields(ripple::sfPreviousFields);
previousFields.setFieldArray(ripple::sfNFTokens, NFTArray2);
previousFields.setFieldArray(ripple::sfNFTokens, nftArray2);
node.emplace_back(std::move(finalFields));
node.emplace_back(std::move(previousFields));
@@ -877,11 +877,11 @@ createNftBurnTxWithMetadataOfDeletedNode(std::string_view accountId, std::string
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
// deleted node should contain finalFields
ripple::STObject finalFields(ripple::sfFinalFields);
ripple::STArray NFTArray{1};
ripple::STArray nftArray{1};
auto entry = ripple::STObject(ripple::sfNFToken);
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
NFTArray.push_back(entry);
finalFields.setFieldArray(ripple::sfNFTokens, NFTArray);
nftArray.push_back(entry);
finalFields.setFieldArray(ripple::sfNFTokens, nftArray);
node.emplace_back(std::move(finalFields));
@@ -924,12 +924,12 @@ createNftBurnTxWithMetadataOfModifiedNode(std::string_view accountId, std::strin
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
ripple::STObject finalFields(ripple::sfFinalFields);
ripple::STArray NFTArray{1};
ripple::STArray nftArray{1};
ripple::STObject previousFields(ripple::sfPreviousFields);
auto entry = ripple::STObject(ripple::sfNFToken);
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
NFTArray.push_back(entry);
previousFields.setFieldArray(ripple::sfNFTokens, NFTArray);
nftArray.push_back(entry);
previousFields.setFieldArray(ripple::sfNFTokens, nftArray);
node.emplace_back(std::move(previousFields));
node.emplace_back(std::move(finalFields));

35
tests/unit/etl/NFTHelpersTests.cpp
View File

@@ -22,14 +22,6 @@
#include "util/LoggerFixtures.hpp"
#include "util/TestObject.hpp"
#include <boost/asio/io_context.hpp>
#include <boost/asio/spawn.hpp>
#include <boost/json/array.hpp>
#include <boost/json/object.hpp>
#include <boost/json/parse.hpp>
#include <boost/json/value.hpp>
#include <gmock/gmock.h>
#include <grpcpp/support/status.h>
#include <gtest/gtest.h>
#include <xrpl/basics/Blob.h>
#include <xrpl/basics/Slice.h>
@@ -43,7 +35,6 @@
#include <xrpl/protocol/TxFormats.h>
#include <xrpl/protocol/TxMeta.h>
#include <xrpl/protocol/UintTypes.h>
#include <xrpl/protocol/tokens.h>
#include <cstdint>
#include <optional>
@@ -127,7 +118,7 @@ TEST_F(NFTHelpersTest, NFTDataFromFailedTx)
ripple::STObject objMeta(sitMeta, ripple::sfMetadata);
objMeta.setFieldU8(ripple::sfTransactionResult, ripple::tecINCOMPLETE);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, objMeta.getSerializer().peekData());
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, objMeta.getSerializer().peekData());
auto const [nftTxs, nftDatas] =
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()}));
@@ -149,7 +140,7 @@ TEST_F(NFTHelpersTest, NotNFTTx)
kTX
);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const [nftTxs, nftDatas] =
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()}));
@@ -164,7 +155,7 @@ TEST_F(NFTHelpersTest, NFTModifyWithURI)
ripple::Blob const uriBlob(uri.begin(), uri.end());
auto const tx = createNftModifyTxWithMetadata(kACCOUNT, kNFT_ID, uriBlob);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] =
@@ -178,7 +169,7 @@ TEST_F(NFTHelpersTest, NFTModifyWithURI)
TEST_F(NFTHelpersTest, NFTModifyWithoutURI)
{
auto const tx = createNftModifyTxWithMetadata(kACCOUNT, kNFT_ID, ripple::Blob{});
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -205,7 +196,7 @@ TEST_F(NFTHelpersTest, NFTMintCantFindNewNFT)
// No NFT added to the page
auto const tx =
createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, std::nullopt, std::nullopt, kPAGE_INDEX);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
EXPECT_THROW(
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()})),
@@ -218,7 +209,7 @@ TEST_F(NFTHelpersTest, NFTMintFromCreatedNode)
std::string const uri("1234567890A");
ripple::Blob const uriBlob(uri.begin(), uri.end());
auto const tx = createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, kNFT_ID, uri, kPAGE_INDEX);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -231,7 +222,7 @@ TEST_F(NFTHelpersTest, NFTMintFromCreatedNode)
TEST_F(NFTHelpersTest, NFTMintWithoutUriField)
{
auto const tx = createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, kNFT_ID, std::nullopt, kPAGE_INDEX);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -311,7 +302,7 @@ TEST_F(NFTHelpersTest, NFTCancelOfferContainsDuplicateNFTs)
auto const tx = createCancelNftOffersTxWithMetadata(
kACCOUNT, 1, 2, std::vector<std::string>{kNFT_ID2, kNFT_ID, kNFT_ID2, kNFT_ID}
);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -358,7 +349,7 @@ TEST_F(NFTHelpersTest, UniqueNFTDatas)
TEST_F(NFTHelpersTest, NFTAcceptBuyerOffer)
{
auto const tx = createAcceptNftBuyerOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, kOFFER_ID);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -385,7 +376,7 @@ TEST_F(NFTHelpersTest, NFTAcceptBuyerOfferCheckOfferIDFail)
TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromCreatedNode)
{
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT2, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, true);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -398,7 +389,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromCreatedNode)
TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromModifiedNode)
{
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT2, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, false);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -412,7 +403,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferCheckFail)
{
// The only changed nft page is owned by ACCOUNT, thus can't find the new owner
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, true);
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
EXPECT_THROW(
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()})),
@@ -464,7 +455,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferIDNotInMetaData)
TEST_F(NFTHelpersTest, NFTCreateOffer)
{
auto const tx = createCreateNftOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, 1, kOFFER_ID);
ripple::TxMeta txMeta(ripple::uint256(kTX), 5, tx.metadata);
ripple::TxMeta const txMeta(ripple::uint256(kTX), 5, tx.metadata);
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);