ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-05 16:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: nftData unique bug (#1550)

Browse Source 
Fix: failed to unique the NFT data in one ledger as we wish.
This commit is contained in:
cyan317
2024-07-25 11:05:28 +01:00
committed by GitHub
parent 77494245a9
commit 895f3c0059
9 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,22 +17,28 @@
*/
//==============================================================================
#include "data/DBHelpers.hpp"
#include "etl/NFTHelpers.hpp"
#include "util/LoggerFixtures.hpp"
#include "util/TestObject.hpp"
#include <gtest/gtest.h>
#include <xrpl/basics/Blob.h>
#include <xrpl/basics/base_uint.h>
#include <xrpl/protocol/SField.h>
#include <xrpl/protocol/STObject.h>
#include <xrpl/protocol/STTx.h>
#include <xrpl/protocol/Serializer.h>
#include <xrpl/protocol/TxMeta.h>
#include <cstdint>
#include <string>
#include <vector>
constexpr static auto ACCOUNT = "rM2AGCCCRb373FRuD8wHyUwUsh2dV4BW5Q";
constexpr static auto NFTID = "0008013AE1CD8B79A8BCB52335CD40DE97401B2D60A828720000099B00000000";
constexpr static auto NFTID2 = "05FB0EB4B899F056FA095537C5817163801F544BAFCEA39C995D76DB4D16F9DA";
constexpr static auto OFFER1 = "23F1A95D7AAB7108D5CE7EEAF504B2894B8C674E6D68499076441C4837282BF8";
constexpr static auto TX = "13F1A95D7AAB7108D5CE7EEAF504B2894B8C674E6D68499076441C4837282BF8";
struct NFTHelpersTests : public NoLoggerFixture {};
@@ -59,3 +65,37 @@ TEST_F(NFTHelpersTests, ConvertDataFromNFTCancelOfferTxContainingDuplicateNFT)
EXPECT_EQ(nftTxs.size(), 2);
EXPECT_FALSE(nftDatas);
}
TEST_F(NFTHelpersTests, UniqueNFTDatas)
{
std::vector<NFTsData> nftDatas;
auto const generateNFTsData = [](char const* nftID, std::uint32_t txIndex) {
auto const tx = CreateCreateNFTOfferTxWithMetadata(ACCOUNT, 1, 50, nftID, 123, OFFER1);
ripple::SerialIter s{tx.metadata.data(), tx.metadata.size()};
ripple::STObject meta{s, ripple::sfMetadata};
meta.setFieldU32(ripple::sfTransactionIndex, txIndex);
ripple::TxMeta const txMeta(ripple::uint256(TX), 1, meta.getSerializer().peekData());
auto const account = GetAccountIDWithString(ACCOUNT);
return NFTsData{ripple::uint256(nftID), account, ripple::Blob{}, txMeta};
};
nftDatas.push_back(generateNFTsData(NFTID, 3));
nftDatas.push_back(generateNFTsData(NFTID, 1));
nftDatas.push_back(generateNFTsData(NFTID, 2));
nftDatas.push_back(generateNFTsData(NFTID2, 4));
nftDatas.push_back(generateNFTsData(NFTID2, 1));
nftDatas.push_back(generateNFTsData(NFTID2, 5));
auto const uniqueNFTDatas = etl::getUniqueNFTsDatas(nftDatas);
EXPECT_EQ(uniqueNFTDatas.size(), 2);
EXPECT_EQ(uniqueNFTDatas[0].ledgerSequence, 1);
EXPECT_EQ(uniqueNFTDatas[1].ledgerSequence, 1);
EXPECT_EQ(uniqueNFTDatas[0].transactionIndex, 5);
EXPECT_EQ(uniqueNFTDatas[1].transactionIndex, 3);
EXPECT_EQ(uniqueNFTDatas[0].tokenID, ripple::uint256(NFTID2));
EXPECT_EQ(uniqueNFTDatas[1].tokenID, ripple::uint256(NFTID));
}

6
tests/unit/rpc/handlers/LedgerEntryTests.cpp
View File

@@ -2847,7 +2847,7 @@ TEST_F(RPCLedgerEntryTest, ObjectUpdateIncludeDelete)
.WillRepeatedly(Return(line1.getSerializer().peekData()));
EXPECT_CALL(*backend, doFetchLedgerObject(ripple::uint256{INDEX1}, RANGEMAX - 1, _))
.WillRepeatedly(Return(line2.getSerializer().peekData()));
runSpawn([&, this](auto yield) {
auto const handler = AnyHandler{LedgerEntryHandler{backend}};
auto const req = json::parse(fmt::format(
@@ -2920,8 +2920,7 @@ TEST_F(RPCLedgerEntryTest, ObjectSeqNotExist)
EXPECT_CALL(*backend, fetchLedgerBySequence(RANGEMAX, _)).WillRepeatedly(Return(ledgerinfo));
EXPECT_CALL(*backend, doFetchLedgerObject(ripple::uint256{INDEX1}, RANGEMAX, _))
.WillOnce(Return(std::optional<Blob>{}));
EXPECT_CALL(*backend, doFetchLedgerObjectSeq(ripple::uint256{INDEX1}, RANGEMAX, _))
.WillOnce(Return(std::nullopt));
EXPECT_CALL(*backend, doFetchLedgerObjectSeq(ripple::uint256{INDEX1}, RANGEMAX, _)).WillOnce(Return(std::nullopt));
runSpawn([&, this](auto yield) {
auto const handler = AnyHandler{LedgerEntryHandler{backend}};
@@ -2939,4 +2938,3 @@ TEST_F(RPCLedgerEntryTest, ObjectSeqNotExist)
EXPECT_EQ(myerr, "entryNotFound");
});
}