Skip to content

Commit 2fd16cd

Browse files
github-actions[bot]kuznetsss
github-actions[bot]
and
kuznetsss
authored
style: clang-tidy auto fixes (#1868)
Fixes #1867. Please review and commit clang-tidy fixes. Co-authored-by: kuznetsss <15742918+kuznetsss@users.noreply.github.com>
1 parent 89af8fe commit 2fd16cd

File tree

2 files changed

+28
-37
lines changed

2 files changed

+28
-37
lines changed

‎tests/common/util/TestObject.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ createMintNftTxWithMetadataOfCreatedNode(
761761
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
762762

763763
ripple::STObject newFields(ripple::sfNewFields);
764-
ripple::STArray NFTArray1{1};
764+
ripple::STArray nftArray1{1};
765765

766766
if (nftID) {
767767
// finalFields contain new NFT while previousFields does not
@@ -770,9 +770,9 @@ createMintNftTxWithMetadataOfCreatedNode(
770770
if (uri)
771771
entry.setFieldVL(ripple::sfURI, ripple::Slice(uri->data(), uri->size()));
772772

773-
NFTArray1.push_back(entry);
773+
nftArray1.push_back(entry);
774774
}
775-
newFields.setFieldArray(ripple::sfNFTokens, NFTArray1);
775+
newFields.setFieldArray(ripple::sfNFTokens, nftArray1);
776776
node.emplace_back(std::move(newFields));
777777
if (pageIndex)
778778
node.setFieldH256(ripple::sfLedgerIndex, ripple::uint256{*pageIndex});
@@ -820,26 +820,26 @@ createNftModifyTxWithMetadata(std::string_view accountId, std::string_view nftID
820820
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
821821

822822
ripple::STObject finalFields(ripple::sfFinalFields);
823-
ripple::STArray NFTArray1{1};
824-
ripple::STArray NFTArray2{1};
823+
ripple::STArray nftArray1{1};
824+
ripple::STArray nftArray2{1};
825825

826826
// finalFields contain new NFT while previousFields does not
827827
auto entry = ripple::STObject(ripple::sfNFToken);
828828
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
829829
if (!uri.empty())
830830
entry.setFieldVL(ripple::sfURI, uri);
831-
NFTArray1.push_back(entry);
831+
nftArray1.push_back(entry);
832832

833833
auto entry2 = ripple::STObject(ripple::sfNFToken);
834834
entry2.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
835835
char const* url = "previous";
836836
entry2.setFieldVL(ripple::sfURI, ripple::Slice(url, 7));
837-
NFTArray2.push_back(entry2);
837+
nftArray2.push_back(entry2);
838838

839-
finalFields.setFieldArray(ripple::sfNFTokens, NFTArray1);
839+
finalFields.setFieldArray(ripple::sfNFTokens, nftArray1);
840840

841841
ripple::STObject previousFields(ripple::sfPreviousFields);
842-
previousFields.setFieldArray(ripple::sfNFTokens, NFTArray2);
842+
previousFields.setFieldArray(ripple::sfNFTokens, nftArray2);
843843

844844
node.emplace_back(std::move(finalFields));
845845
node.emplace_back(std::move(previousFields));
@@ -877,11 +877,11 @@ createNftBurnTxWithMetadataOfDeletedNode(std::string_view accountId, std::string
877877
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
878878
// deleted node should contain finalFields
879879
ripple::STObject finalFields(ripple::sfFinalFields);
880-
ripple::STArray NFTArray{1};
880+
ripple::STArray nftArray{1};
881881
auto entry = ripple::STObject(ripple::sfNFToken);
882882
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
883-
NFTArray.push_back(entry);
884-
finalFields.setFieldArray(ripple::sfNFTokens, NFTArray);
883+
nftArray.push_back(entry);
884+
finalFields.setFieldArray(ripple::sfNFTokens, nftArray);
885885

886886
node.emplace_back(std::move(finalFields));
887887

@@ -924,12 +924,12 @@ createNftBurnTxWithMetadataOfModifiedNode(std::string_view accountId, std::strin
924924
node.setFieldU16(ripple::sfLedgerEntryType, ripple::ltNFTOKEN_PAGE);
925925

926926
ripple::STObject finalFields(ripple::sfFinalFields);
927-
ripple::STArray NFTArray{1};
927+
ripple::STArray nftArray{1};
928928
ripple::STObject previousFields(ripple::sfPreviousFields);
929929
auto entry = ripple::STObject(ripple::sfNFToken);
930930
entry.setFieldH256(ripple::sfNFTokenID, ripple::uint256{nftID});
931-
NFTArray.push_back(entry);
932-
previousFields.setFieldArray(ripple::sfNFTokens, NFTArray);
931+
nftArray.push_back(entry);
932+
previousFields.setFieldArray(ripple::sfNFTokens, nftArray);
933933

934934
node.emplace_back(std::move(previousFields));
935935
node.emplace_back(std::move(finalFields));

‎tests/unit/etl/NFTHelpersTests.cpp‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@
2222
#include "util/LoggerFixtures.hpp"
2323
#include "util/TestObject.hpp"
2424

25-
#include <boost/asio/io_context.hpp>
26-
#include <boost/asio/spawn.hpp>
27-
#include <boost/json/array.hpp>
28-
#include <boost/json/object.hpp>
29-
#include <boost/json/parse.hpp>
30-
#include <boost/json/value.hpp>
31-
#include <gmock/gmock.h>
32-
#include <grpcpp/support/status.h>
3325
#include <gtest/gtest.h>
3426
#include <xrpl/basics/Blob.h>
3527
#include <xrpl/basics/Slice.h>
@@ -43,7 +35,6 @@
4335
#include <xrpl/protocol/TxFormats.h>
4436
#include <xrpl/protocol/TxMeta.h>
4537
#include <xrpl/protocol/UintTypes.h>
46-
#include <xrpl/protocol/tokens.h>
4738

4839
#include <cstdint>
4940
#include <optional>
@@ -127,7 +118,7 @@ TEST_F(NFTHelpersTest, NFTDataFromFailedTx)
127118
ripple::STObject objMeta(sitMeta, ripple::sfMetadata);
128119
objMeta.setFieldU8(ripple::sfTransactionResult, ripple::tecINCOMPLETE);
129120

130-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, objMeta.getSerializer().peekData());
121+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, objMeta.getSerializer().peekData());
131122
auto const [nftTxs, nftDatas] =
132123
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()}));
133124

@@ -149,7 +140,7 @@ TEST_F(NFTHelpersTest, NotNFTTx)
149140
kTX
150141
);
151142

152-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
143+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
153144

154145
auto const [nftTxs, nftDatas] =
155146
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()}));
@@ -164,7 +155,7 @@ TEST_F(NFTHelpersTest, NFTModifyWithURI)
164155
ripple::Blob const uriBlob(uri.begin(), uri.end());
165156

166157
auto const tx = createNftModifyTxWithMetadata(kACCOUNT, kNFT_ID, uriBlob);
167-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
158+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
168159

169160
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
170161
auto const [nftTxs, nftDatas] =
@@ -178,7 +169,7 @@ TEST_F(NFTHelpersTest, NFTModifyWithURI)
178169
TEST_F(NFTHelpersTest, NFTModifyWithoutURI)
179170
{
180171
auto const tx = createNftModifyTxWithMetadata(kACCOUNT, kNFT_ID, ripple::Blob{});
181-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
172+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
182173
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
183174
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
184175

@@ -205,7 +196,7 @@ TEST_F(NFTHelpersTest, NFTMintCantFindNewNFT)
205196
// No NFT added to the page
206197
auto const tx =
207198
createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, std::nullopt, std::nullopt, kPAGE_INDEX);
208-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
199+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
209200

210201
EXPECT_THROW(
211202
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()})),
@@ -218,7 +209,7 @@ TEST_F(NFTHelpersTest, NFTMintFromCreatedNode)
218209
std::string const uri("1234567890A");
219210
ripple::Blob const uriBlob(uri.begin(), uri.end());
220211
auto const tx = createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, kNFT_ID, uri, kPAGE_INDEX);
221-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
212+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
222213
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
223214

224215
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -231,7 +222,7 @@ TEST_F(NFTHelpersTest, NFTMintFromCreatedNode)
231222
TEST_F(NFTHelpersTest, NFTMintWithoutUriField)
232223
{
233224
auto const tx = createMintNftTxWithMetadataOfCreatedNode(kACCOUNT, 1, 20, 1, kNFT_ID, std::nullopt, kPAGE_INDEX);
234-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
225+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
235226
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
236227

237228
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
@@ -311,7 +302,7 @@ TEST_F(NFTHelpersTest, NFTCancelOfferContainsDuplicateNFTs)
311302
auto const tx = createCancelNftOffersTxWithMetadata(
312303
kACCOUNT, 1, 2, std::vector<std::string>{kNFT_ID2, kNFT_ID, kNFT_ID2, kNFT_ID}
313304
);
314-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
305+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
315306
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
316307
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
317308

@@ -358,7 +349,7 @@ TEST_F(NFTHelpersTest, UniqueNFTDatas)
358349
TEST_F(NFTHelpersTest, NFTAcceptBuyerOffer)
359350
{
360351
auto const tx = createAcceptNftBuyerOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, kOFFER_ID);
361-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
352+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
362353
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
363354
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
364355

@@ -385,7 +376,7 @@ TEST_F(NFTHelpersTest, NFTAcceptBuyerOfferCheckOfferIDFail)
385376
TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromCreatedNode)
386377
{
387378
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT2, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, true);
388-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
379+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
389380
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
390381
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
391382

@@ -398,7 +389,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromCreatedNode)
398389
TEST_F(NFTHelpersTest, NFTAcceptSellerOfferFromModifiedNode)
399390
{
400391
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT2, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, false);
401-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
392+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
402393
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
403394
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
404395

@@ -412,7 +403,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferCheckFail)
412403
{
413404
// The only changed nft page is owned by ACCOUNT, thus can't find the new owner
414405
auto const tx = createAcceptNftSellerOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, kOFFER_ID, kPAGE_INDEX, true);
415-
ripple::TxMeta txMeta(ripple::uint256(kTX), 1, tx.metadata);
406+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 1, tx.metadata);
416407

417408
EXPECT_THROW(
418409
etl::getNFTDataFromTx(txMeta, ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()})),
@@ -464,7 +455,7 @@ TEST_F(NFTHelpersTest, NFTAcceptSellerOfferIDNotInMetaData)
464455
TEST_F(NFTHelpersTest, NFTCreateOffer)
465456
{
466457
auto const tx = createCreateNftOfferTxWithMetadata(kACCOUNT, 1, 2, kNFT_ID, 1, kOFFER_ID);
467-
ripple::TxMeta txMeta(ripple::uint256(kTX), 5, tx.metadata);
458+
ripple::TxMeta const txMeta(ripple::uint256(kTX), 5, tx.metadata);
468459
auto const sttx = ripple::STTx(ripple::SerialIter{tx.transaction.data(), tx.transaction.size()});
469460
auto const [nftTxs, nftDatas] = etl::getNFTDataFromTx(txMeta, sttx);
470461

0 commit comments

Comments
 (0)