ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-08-23 07:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into sponsor

Browse Source
This commit is contained in:
tequ
2026-03-25 11:59:44 +09:00
parent aacb8e4a68 589c9c694c
commit 41429dcc99
331 changed files with 6022 additions and 5351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/app/NFToken_test.cpp
View File

@@ -53,7 +53,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
}
// Helper function returns the close time of the parent ledger.
std::uint32_t
static std::uint32_t
lastClose(test::jtx::Env& env)
{
return env.current()->header().parentCloseTime.time_since_epoch().count();
@@ -243,7 +243,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
{
env(token::burn(alice, token::getID(env, alice, 0, seq++)));
env.close();
checkAliceOwnerMintedBurned((33 - seq) ? 1 : 0, 33, seq, __LINE__);
checkAliceOwnerMintedBurned(((33 - seq) != 0u) ? 1 : 0, 33, seq, __LINE__);
}
// alice burns a non-existent NFT.
@@ -352,7 +352,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
{
env(token::burn(minter, token::getID(env, alice, 0, nftSeq++)));
env.close();
checkMintersOwnerMintedBurned(0, 66, nftSeq, (65 - seq) ? 1 : 0, 0, 0, __LINE__);
checkMintersOwnerMintedBurned(
0, 66, nftSeq, ((65 - seq) != 0u) ? 1 : 0, 0, 0, __LINE__);
}
// minter has one more NFT to burn. Should take her owner count to
@@ -1548,7 +1549,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
env.close();
// becky attempts to sell the nft for AUD.
TER const createOfferTER = xferFee ? TER(tecNO_LINE) : TER(tesSUCCESS);
TER const createOfferTER = (xferFee != 0u) ? TER(tecNO_LINE) : TER(tesSUCCESS);
uint256 const beckyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)),
txflags(tfSellNFToken),
@@ -4551,7 +4552,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
};
// There are no sell offers.
checkOffers("nft_sell_offers", 0, false, __LINE__);
checkOffers("nft_sell_offers", 0, 0, __LINE__);
// A lambda that generates sell offers.
STAmount sellPrice = XRP(0);