From e7b63f04afbb8e65498449638e87ffada9a32ddf Mon Sep 17 00:00:00 2001 From: Mayukha Vadari Date: Thu, 30 Apr 2026 15:27:10 -0400 Subject: [PATCH] keylet::nftoffer -> keylet::nftokenOffer --- include/xrpl/protocol/Indexes.h | 4 +- .../xrpl/protocol/detail/ledger_entries.macro | 2 +- src/libxrpl/ledger/helpers/NFTokenHelpers.cpp | 4 +- src/libxrpl/protocol/Indexes.cpp | 2 +- src/libxrpl/tx/Transactor.cpp | 2 +- .../tx/transactors/nft/NFTokenAcceptOffer.cpp | 4 +- .../tx/transactors/nft/NFTokenCancelOffer.cpp | 2 +- src/test/app/FixNFTokenPageLinks_test.cpp | 4 +- src/test/app/Freeze_test.cpp | 12 +- src/test/app/LPTokenTransfer_test.cpp | 4 +- src/test/app/NFTokenAuth_test.cpp | 18 +- src/test/app/NFTokenBurn_test.cpp | 27 +- src/test/app/NFTokenDir_test.cpp | 16 +- src/test/app/NFToken_test.cpp | 336 +++++++++--------- src/test/rpc/LedgerEntry_test.cpp | 2 +- src/test/rpc/Subscribe_test.cpp | 17 +- .../rpc/handlers/orderbook/NFTOffersHelpers.h | 2 +- 17 files changed, 235 insertions(+), 223 deletions(-) diff --git a/include/xrpl/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h index 6bb097db4d..4be1ba93c6 100644 --- a/include/xrpl/protocol/Indexes.h +++ b/include/xrpl/protocol/Indexes.h @@ -233,10 +233,10 @@ nftokenPage(Keylet const& k, uint256 const& token); /** An offer from an account to buy or sell an NFT */ Keylet -nftoffer(AccountID const& owner, std::uint32_t seq); +nftokenOffer(AccountID const& owner, std::uint32_t seq); inline Keylet -nftoffer(uint256 const& offer) +nftokenOffer(uint256 const& offer) { return {ltNFTOKEN_OFFER, offer}; } diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro index 044eea03a7..d8b7c887a1 100644 --- a/include/xrpl/protocol/detail/ledger_entries.macro +++ b/include/xrpl/protocol/detail/ledger_entries.macro @@ -21,7 +21,7 @@ /** A ledger object which identifies an offer to buy or sell an NFT. - \sa keylet::nftoffer + \sa keylet::nftokenOffer */ LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, nft_offer, ({ {sfOwner, soeREQUIRED}, diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp index 802bf02714..8f43453b4b 100644 --- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp +++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp @@ -600,7 +600,7 @@ removeTokenOffersWithLimit(ApplyView& view, Keylet const& directory, std::size_t // deleting during iteration. for (int i = offerIndexes.size() - 1; i >= 0; --i) { - if (auto const offer = view.peek(keylet::nftoffer(offerIndexes[i]))) + if (auto const offer = view.peek(keylet::nftokenOffer(offerIndexes[i]))) { if (deleteTokenOffer(view, offer)) { @@ -937,7 +937,7 @@ tokenOfferCreateApply( priorBalance < view.fees().accountReserve((*acct)[sfOwnerCount] + 1)) return tecINSUFFICIENT_RESERVE; - auto const offerID = keylet::nftoffer(acctID, seqProxy.value()); + auto const offerID = keylet::nftokenOffer(acctID, seqProxy.value()); // Create the offer: { diff --git a/src/libxrpl/protocol/Indexes.cpp b/src/libxrpl/protocol/Indexes.cpp index 67e58fa779..6e73a8cd8c 100644 --- a/src/libxrpl/protocol/Indexes.cpp +++ b/src/libxrpl/protocol/Indexes.cpp @@ -405,7 +405,7 @@ nftokenPage(Keylet const& k, uint256 const& token) } Keylet -nftoffer(AccountID const& owner, std::uint32_t seq) +nftokenOffer(AccountID const& owner, std::uint32_t seq) { return {ltNFTOKEN_OFFER, indexHash(LedgerNameSpace::NFTOKEN_OFFER, owner, seq)}; } diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp index 208e8e4dbc..8e5f1d0576 100644 --- a/src/libxrpl/tx/Transactor.cpp +++ b/src/libxrpl/tx/Transactor.cpp @@ -996,7 +996,7 @@ removeExpiredNFTokenOffers( for (auto const& index : offers) { - if (auto const offer = view.peek(keylet::nftoffer(index))) + if (auto const offer = view.peek(keylet::nftokenOffer(index))) { nft::deleteTokenOffer(view, offer); if (++removed == expiredOfferRemoveLimit) diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp index da25f76f86..7b486642d0 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp @@ -61,7 +61,7 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx) if (id->isZero()) return {nullptr, tecOBJECT_NOT_FOUND}; - auto offerSLE = ctx.view.read(keylet::nftoffer(*id)); + auto offerSLE = ctx.view.read(keylet::nftokenOffer(*id)); if (!offerSLE) return {nullptr, tecOBJECT_NOT_FOUND}; @@ -443,7 +443,7 @@ NFTokenAcceptOffer::doApply() auto const loadToken = [this](std::optional const& id) { std::shared_ptr sle; if (id) - sle = view().peek(keylet::nftoffer(*id)); + sle = view().peek(keylet::nftokenOffer(*id)); return sle; }; diff --git a/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp index 9d25a7335f..281142775b 100644 --- a/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp +++ b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp @@ -83,7 +83,7 @@ NFTokenCancelOffer::doApply() { for (auto const& id : ctx_.tx[sfNFTokenOffers]) { - if (auto offer = view().peek(keylet::nftoffer(id)); + if (auto offer = view().peek(keylet::nftokenOffer(id)); offer && !nft::deleteTokenOffer(view(), offer)) { // LCOV_EXCL_START diff --git a/src/test/app/FixNFTokenPageLinks_test.cpp b/src/test/app/FixNFTokenPageLinks_test.cpp index 6f778318b3..8382ad2690 100644 --- a/src/test/app/FixNFTokenPageLinks_test.cpp +++ b/src/test/app/FixNFTokenPageLinks_test.cpp @@ -360,7 +360,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite dariaNFTs.reserve(32); for (int i = 0; i < 32; ++i) { - uint256 const offerIndex = keylet::nftoffer(carol, env.seq(carol)).key; + uint256 const offerIndex = keylet::nftokenOffer(carol, env.seq(carol)).key; env(token::createOffer(carol, carolNFTs.back(), XRP(0)), txflags(tfSellNFToken)); env.close(); @@ -394,7 +394,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite // back from daria. for (uint256 const& nft : dariaNFTs) { - uint256 const offerIndex = keylet::nftoffer(carol, env.seq(carol)).key; + uint256 const offerIndex = keylet::nftokenOffer(carol, env.seq(carol)).key; env(token::createOffer(carol, nft, drops(1)), token::owner(daria)); env.close(); diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp index 29127ec8e1..ca682219c5 100644 --- a/src/test/app/Freeze_test.cpp +++ b/src/test/app/Freeze_test.cpp @@ -1779,7 +1779,7 @@ class Freeze_test : public beast::unit_test::suite env(token::mint(A2, 0), txflags(tfTransferable)); env.close(); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(10)), token::owner(A2)); env.close(); @@ -1865,10 +1865,10 @@ class Freeze_test : public beast::unit_test::suite env(token::mint(A2, 0), txflags(tfTransferable)); env.close(); - uint256 const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key; + uint256 const sellIdx = keylet::nftokenOffer(A2, env.seq(A2)).key; env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken)); env.close(); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(11)), token::owner(A2)); env.close(); @@ -1891,13 +1891,13 @@ class Freeze_test : public beast::unit_test::suite env(token::mint(minter, 0), token::xferFee(1u), txflags(tfTransferable)); env.close(); - uint256 const minterSellIdx = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellIdx = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, drops(1)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(A2, minterSellIdx)); env.close(); - uint256 const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key; + uint256 const sellIdx = keylet::nftokenOffer(A2, env.seq(A2)).key; env(token::createOffer(A2, nftID, USD(100)), txflags(tfSellNFToken)); env.close(); env(trust(G1, minter["USD"](1000), tfSetFreeze | tfSetDeepFreeze)); @@ -1950,7 +1950,7 @@ class Freeze_test : public beast::unit_test::suite env(token::mint(account, 0), txflags(tfTransferable)); env.close(); - uint256 const sellOfferIndex = keylet::nftoffer(account, env.seq(account)).key; + uint256 const sellOfferIndex = keylet::nftokenOffer(account, env.seq(account)).key; env(token::createOffer(account, nftID, currency), txflags(tfSellNFToken)); env.close(); diff --git a/src/test/app/LPTokenTransfer_test.cpp b/src/test/app/LPTokenTransfer_test.cpp index 2b440c67d5..91a8e76362 100644 --- a/src/test/app/LPTokenTransfer_test.cpp +++ b/src/test/app/LPTokenTransfer_test.cpp @@ -359,7 +359,7 @@ class LPTokenTransfer_test : public jtx::AMMTest env.close(); // bob creates a sell offer for lptoken - uint256 const sellOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const sellOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}), txflags(tfSellNFToken)); env.close(); @@ -420,7 +420,7 @@ class LPTokenTransfer_test : public jtx::AMMTest env.close(); // bob creates a buy offer with lptoken despite bob's USD is frozen - uint256 const buyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}), token::owner(carol)); env.close(); diff --git a/src/test/app/NFTokenAuth_test.cpp b/src/test/app/NFTokenAuth_test.cpp index 445cbcb5c0..4b3f75e005 100644 --- a/src/test/app/NFTokenAuth_test.cpp +++ b/src/test/app/NFTokenAuth_test.cpp @@ -43,7 +43,7 @@ class NFTokenAuth_test : public beast::unit_test::suite env(token::mint(account, 0), token::xferFee(xfee), txflags(tfTransferable)); env.close(); - auto const sellIdx = keylet::nftoffer(account, env.seq(account)).key; + auto const sellIdx = keylet::nftokenOffer(account, env.seq(account)).key; env(token::createOffer(account, nftID, currency), txflags(tfSellNFToken)); env.close(); @@ -74,7 +74,7 @@ public: env(pay(G1, A1, USD(1000))); auto const [nftID, _] = mintAndOfferNFT(env, A2, drops(1)); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; // It should be possible to create a buy offer even if NFT owner is not // authorized @@ -180,7 +180,7 @@ public: env(pay(G1, A2, USD(10))); env.close(); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(10)), token::owner(A2)); env.close(); @@ -246,7 +246,7 @@ public: // Authorizing trustline to make an offer creation possible env(trust(G1, USD(0), A2, tfSetfAuth)); env.close(); - auto const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key; + auto const sellIdx = keylet::nftokenOffer(A2, env.seq(A2)).key; env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken)); env.close(); // @@ -270,7 +270,7 @@ public: } else { - auto const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key; + auto const sellIdx = keylet::nftokenOffer(A2, env.seq(A2)).key; // Old behavior: sell offer can be created without authorization env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken)); @@ -356,7 +356,7 @@ public: env.close(); auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10)); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(11)), token::owner(A2)); env.close(); @@ -425,7 +425,7 @@ public: env.close(); auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10)); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(11)), token::owner(A2)); env.close(); @@ -487,7 +487,7 @@ public: env.close(); auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10)); - auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key; + auto const buyIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(11)), token::owner(A2)); env.close(); @@ -563,7 +563,7 @@ public: auto const [nftID, minterSellIdx] = mintAndOfferNFT(env, minter, drops(1), 1); env(token::acceptSellOffer(A1, minterSellIdx)); - uint256 const sellIdx = keylet::nftoffer(A1, env.seq(A1)).key; + uint256 const sellIdx = keylet::nftokenOffer(A1, env.seq(A1)).key; env(token::createOffer(A1, nftID, USD(100)), txflags(tfSellNFToken)); if (features[fixEnforceNFTokenTrustlineV2]) diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp index 4707433a75..c61bd036d8 100644 --- a/src/test/app/NFTokenBurn_test.cpp +++ b/src/test/app/NFTokenBurn_test.cpp @@ -76,7 +76,7 @@ class NFTokenBurn_test : public beast::unit_test::suite for (uint32_t i = 0; i < tokenCancelCount; ++i) { // Create sell offer - offerIndexes.push_back(keylet::nftoffer(owner, env.seq(owner)).key); + offerIndexes.push_back(keylet::nftokenOffer(owner, env.seq(owner)).key); env(token::createOffer(owner, nftokenID, drops(1)), txflags(tfSellNFToken)); env.close(); } @@ -235,7 +235,8 @@ class NFTokenBurn_test : public beast::unit_test::suite { // We do the same work on alice and minter, so make a lambda. auto xferNFT = [&env, &becky](AcctStat& acct, auto& iter) { - uint256 const offerIndex = keylet::nftoffer(acct.acct, env.seq(acct.acct)).key; + uint256 const offerIndex = + keylet::nftokenOffer(acct.acct, env.seq(acct.acct)).key; env(token::createOffer(acct, *iter, XRP(0)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(becky, offerIndex)); @@ -868,11 +869,11 @@ class NFTokenBurn_test : public beast::unit_test::suite // Verify all sell offers are present in the ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(env.le(keylet::nftokenOffer(offerIndex))); } // Becky creates a buy offer - uint256 const beckyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftokenID, drops(1)), token::owner(alice)); env.close(); @@ -884,12 +885,12 @@ class NFTokenBurn_test : public beast::unit_test::suite // that alice created for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(!env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(!env.le(keylet::nftokenOffer(offerIndex))); } // Burning the token should also remove the one buy offer // that becky created - BEAST_EXPECT(!env.le(keylet::nftoffer(beckyOfferIndex))); + BEAST_EXPECT(!env.le(keylet::nftokenOffer(beckyOfferIndex))); // alice and becky should have ownerCounts of zero BEAST_EXPECT(ownerCount(env, alice) == 0); @@ -915,7 +916,7 @@ class NFTokenBurn_test : public beast::unit_test::suite // Verify all sell offers are present in the ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(env.le(keylet::nftokenOffer(offerIndex))); } // Burn the token @@ -926,7 +927,7 @@ class NFTokenBurn_test : public beast::unit_test::suite // Count the number of sell offers that have been deleted for (uint256 const& offerIndex : offerIndexes) { - if (!env.le(keylet::nftoffer(offerIndex))) + if (!env.le(keylet::nftokenOffer(offerIndex))) offerDeletedCount++; } @@ -959,7 +960,7 @@ class NFTokenBurn_test : public beast::unit_test::suite // Verify all sell offers are present in the ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(env.le(keylet::nftokenOffer(offerIndex))); } // becky creates 2 buy offers @@ -976,7 +977,7 @@ class NFTokenBurn_test : public beast::unit_test::suite // ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(!env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(!env.le(keylet::nftokenOffer(offerIndex))); } // alice should have ownerCount of zero because all her @@ -1047,7 +1048,7 @@ class NFTokenBurn_test : public beast::unit_test::suite env.close(); // Minter creates an offer for the NFToken. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nfts.back(), XRP(0)), txflags(tfSellNFToken)); env.close(); @@ -1118,7 +1119,7 @@ class NFTokenBurn_test : public beast::unit_test::suite nfts.pop_back(); // alice creates an offer for the NFToken. - uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, last32NFTs.back(), XRP(0)), txflags(tfSellNFToken)); env.close(); @@ -1152,7 +1153,7 @@ class NFTokenBurn_test : public beast::unit_test::suite for (uint256 const nftID : last32NFTs) { // minter creates an offer for the NFToken. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp index a1527e8601..d9999617f4 100644 --- a/src/test/app/NFTokenDir_test.cpp +++ b/src/test/app/NFTokenDir_test.cpp @@ -142,7 +142,7 @@ class NFTokenDir_test : public beast::unit_test::suite std::vector offers; for (uint256 const& nftID : nftIDs) { - offers.emplace_back(keylet::nftoffer(issuer, env.seq(issuer)).key); + offers.emplace_back(keylet::nftokenOffer(issuer, env.seq(issuer)).key); env(token::createOffer(issuer, nftID, XRP(0)), txflags((tfSellNFToken))); env.close(); } @@ -214,7 +214,7 @@ class NFTokenDir_test : public beast::unit_test::suite env.close(); // Create an offer to give the NFT to buyer for free. - offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key); + offers.emplace_back(keylet::nftokenOffer(account, env.seq(account)).key); env(token::createOffer(account, nftID, XRP(0)), token::destination(buyer), txflags((tfSellNFToken))); @@ -237,7 +237,7 @@ class NFTokenDir_test : public beast::unit_test::suite // generates a non-tesSUCCESS error code. for (uint256 const& nftID : nftIDs) { - uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerID = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken)); env.close(); @@ -418,7 +418,7 @@ class NFTokenDir_test : public beast::unit_test::suite env.close(); // Create an offer to give the NFT to buyer for free. - offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key); + offers.emplace_back(keylet::nftokenOffer(account, env.seq(account)).key); env(token::createOffer(account, nftID, XRP(0)), token::destination(buyer), txflags((tfSellNFToken))); @@ -445,7 +445,7 @@ class NFTokenDir_test : public beast::unit_test::suite // generates a non-tesSUCCESS error code. for (uint256 const& nftID : nftIDs) { - uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerID = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken)); env.close(); @@ -648,7 +648,7 @@ class NFTokenDir_test : public beast::unit_test::suite env.close(); // Create an offer to give the NFT to buyer for free. - offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key); + offers.emplace_back(keylet::nftokenOffer(account, env.seq(account)).key); env(token::createOffer(account, nftID, XRP(0)), token::destination(buyer), txflags((tfSellNFToken))); @@ -684,7 +684,7 @@ class NFTokenDir_test : public beast::unit_test::suite // a non-tesSUCCESS error code. for (uint256 const& nftID : nftIDs) { - uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerID = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken)); env.close(); @@ -820,7 +820,7 @@ class NFTokenDir_test : public beast::unit_test::suite env.close(); // Create an offer to give the NFT to buyer for free. - offers[i].emplace_back(keylet::nftoffer(account, env.seq(account)).key); + offers[i].emplace_back(keylet::nftokenOffer(account, env.seq(account)).key); env(token::createOffer(account, nftID, XRP(0)), token::destination(buyer), txflags((tfSellNFToken))); diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index a9252d2b5e..488aa03947 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -143,7 +143,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite Account const alice{"alice"}; env.fund(XRP(10000), alice); env.close(); - uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId1, XRP(1000)), token::owner(master)); env.close(); @@ -861,7 +861,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == 1); // This is the offer we'll try to cancel. - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftAlice0ID, XRP(1)), token::owner(alice), ter(tesSUCCESS)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 1); @@ -987,32 +987,32 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == aliceCount); // alice creates sell offers for her nfts. - uint256 const plainOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const plainOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAlice0ID, XRP(10)), txflags(tfSellNFToken)); env.close(); aliceCount++; BEAST_EXPECT(ownerCount(env, alice) == aliceCount); - uint256 const audOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const audOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAlice0ID, gwAUD(30)), txflags(tfSellNFToken)); env.close(); aliceCount++; BEAST_EXPECT(ownerCount(env, alice) == aliceCount); - uint256 const xrpOnlyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const xrpOnlyOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftXrpOnlyID, XRP(20)), txflags(tfSellNFToken)); env.close(); aliceCount++; BEAST_EXPECT(ownerCount(env, alice) == aliceCount); - uint256 const noXferOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const noXferOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftNoXferID, XRP(30)), txflags(tfSellNFToken)); env.close(); aliceCount++; BEAST_EXPECT(ownerCount(env, alice) == aliceCount); // alice creates a sell offer that will expire soon. - uint256 const aliceExpOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceExpOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftNoXferID, XRP(40)), txflags(tfSellNFToken), token::expiration(lastClose(env) + 5)); @@ -1021,7 +1021,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == aliceCount); // buyer creates a Buy offer that will expire soon. - uint256 const buyerExpOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerExpOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftAlice0ID, XRP(40)), token::owner(alice), token::expiration(lastClose(env) + 5)); @@ -1089,7 +1089,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, buyer) == buyerCount); // The buy offer must be present in the ledger. - uint256 const missingOfferIndex = keylet::nftoffer(alice, 1).key; + uint256 const missingOfferIndex = keylet::nftokenOffer(alice, 1).key; env(token::acceptBuyOffer(buyer, missingOfferIndex), ter(tecOBJECT_NOT_FOUND)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == buyerCount); @@ -1151,7 +1151,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // corresponding buy and sell offers. { // buyer creates a buy offer for one of alice's nfts. - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftAlice0ID, gwAUD(29)), token::owner(alice)); env.close(); buyerCount++; @@ -1184,7 +1184,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite } { // buyer creates a buy offer for one of alice's nfts. - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftAlice0ID, gwAUD(31)), token::owner(alice)); env.close(); buyerCount++; @@ -1223,7 +1223,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // preclaim buy { // buyer creates a buy offer for one of alice's nfts. - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftAlice0ID, gwAUD(30)), token::owner(alice)); env.close(); buyerCount++; @@ -1250,7 +1250,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice gives her NFT to gw, so alice no longer owns nftAlice0. { - uint256 const offerIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const offerIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAlice0ID, XRP(0)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(gw, offerIndex)); @@ -1275,7 +1275,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // preclaim sell { // buyer creates a buy offer for one of alice's nfts. - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftXrpOnlyID, XRP(30)), token::owner(alice)); env.close(); buyerCount++; @@ -1303,7 +1303,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // buyer attempting to accept one of alice's offers with // insufficient funds. { - uint256 const offerIndex = keylet::nftoffer(gw, env.seq(gw)).key; + uint256 const offerIndex = keylet::nftokenOffer(gw, env.seq(gw)).key; env(token::createOffer(gw, nftAlice0ID, XRP(0)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(alice, offerIndex)); @@ -1356,7 +1356,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env(token::mint(minter1, 0u), token::issuer(alice), txflags(flags)); env.close(); - uint256 const offerIndex = keylet::nftoffer(minter1, env.seq(minter1)).key; + uint256 const offerIndex = keylet::nftokenOffer(minter1, env.seq(minter1)).key; env(token::createOffer(minter1, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); @@ -1459,13 +1459,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); BEAST_EXPECT(ownerCount(env, alice) == 2); - uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftIOUsOkayID, gwAUD(50)), txflags(tfSellNFToken)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 3); BEAST_EXPECT(ownerCount(env, buyer) == 1); - uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyerOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftIOUsOkayID, gwAUD(50)), token::owner(alice)); env.close(); BEAST_EXPECT(ownerCount(env, buyer) == 2); @@ -1568,7 +1568,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // becky buys the nft for 1 drop. - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(alice)); env.close(); env(token::acceptBuyOffer(alice, beckyBuyOfferIndex)); @@ -1576,14 +1576,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // becky attempts to sell the nft for AUD. TER const createOfferTER = (xferFee != 0u) ? TER(tecNO_LINE) : TER(tesSUCCESS); - uint256 const beckyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)), txflags(tfSellNFToken), ter(createOfferTER)); env.close(); // cheri offers to buy the nft for CAD. - uint256 const cheriOfferIndex = keylet::nftoffer(cheri, env.seq(cheri)).key; + uint256 const cheriOfferIndex = keylet::nftokenOffer(cheri, env.seq(cheri)).key; env(token::createOffer(cheri, nftNoAutoTrustID, gwCAD(100)), token::owner(becky), ter(createOfferTER)); @@ -1621,14 +1621,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite break; } // becky buys the nft for 1 drop. - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(alice)); env.close(); env(token::acceptBuyOffer(alice, beckyBuyOfferIndex)); env.close(); // becky sells the nft for AUD. - uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckySellOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(cheri, beckySellOfferIndex)); @@ -1638,7 +1638,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(alice, gwAUD) == gwAUD(10)); // becky buys the nft back for CAD. - uint256 const beckyBuyBackOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyBackOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, gwCAD(50)), token::owner(cheri)); env.close(); env(token::acceptBuyOffer(cheri, beckyBuyBackOfferIndex)); @@ -1658,7 +1659,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // alice sells the nft using AUD. - uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceSellOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftNoAutoTrustID, gwAUD(200)), txflags(tfSellNFToken)); env.close(); @@ -1675,7 +1676,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite txflags(tfSellNFToken), ter(tecNO_LINE)); env.close(); - uint256 const cheriSellOfferIndex = keylet::nftoffer(cheri, env.seq(cheri)).key; + uint256 const cheriSellOfferIndex = keylet::nftokenOffer(cheri, env.seq(cheri)).key; env(token::createOffer(cheri, nftNoAutoTrustID, gwCAD(100)), txflags(tfSellNFToken)); env.close(); @@ -1722,7 +1723,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite ter(tefNFTOKEN_IS_NOT_TRANSFERABLE)); // alice offers to sell the nft and becky accepts the offer. - uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceSellOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAliceNoTransferID, XRP(20)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(becky, aliceSellOfferIndex)); @@ -1750,7 +1751,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice offers to buy the nft back from becky. becky accepts // the offer. - uint256 const aliceBuyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceBuyOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAliceNoTransferID, XRP(22)), token::owner(becky)); env.close(); env(token::acceptBuyOffer(becky, aliceBuyOfferIndex)); @@ -1806,7 +1807,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // minter successfully offers their nft for sale. BEAST_EXPECT(ownerCount(env, minter) == 1); - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftMinterNoTransferID, XRP(22)), txflags(tfSellNFToken)); env.close(); BEAST_EXPECT(ownerCount(env, minter) == 2); @@ -1841,7 +1842,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice can create an offer to buy the nft. BEAST_EXPECT(ownerCount(env, alice) == 0); - uint256 const aliceBuyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceBuyOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftMinterNoTransferID, XRP(25)), token::owner(becky)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 1); @@ -1856,7 +1857,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Now minter can create an offer to buy the nft. BEAST_EXPECT(ownerCount(env, minter) == 0); - uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterBuyOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftMinterNoTransferID, XRP(26)), token::owner(becky)); env.close(); BEAST_EXPECT(ownerCount(env, minter) == 1); @@ -1895,12 +1896,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == 1); // Both alice and becky can make offers for alice's nft. - uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceSellOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftAliceID, XRP(20)), txflags(tfSellNFToken)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 2); - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAliceID, XRP(21)), token::owner(alice)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 2); @@ -1912,7 +1913,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, becky) == 2); // becky offers to sell the nft. - uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckySellOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAliceID, XRP(22)), txflags(tfSellNFToken)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 0); @@ -1927,7 +1928,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, minter) == 1); // minter offers to sell the nft. - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftAliceID, XRP(23)), txflags(tfSellNFToken)); env.close(); BEAST_EXPECT(ownerCount(env, alice) == 0); @@ -2009,7 +2010,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Becky buys the nft for XAU(10). Check balances. - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice)); env.close(); BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000)); @@ -2021,7 +2022,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(990)); // becky sells nft to carol. alice's balance should not change. - uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckySellOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(10)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(carol, beckySellOfferIndex)); @@ -2031,7 +2032,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(carol, gwXAU) == gwXAU(990)); // minter buys nft from carol. alice's balance should not change. - uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterBuyOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(10)), token::owner(carol)); env.close(); env(token::acceptBuyOffer(carol, minterBuyOfferIndex)); @@ -2043,7 +2044,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // minter sells the nft to alice. gwXAU balances should finish // where they started. - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(10)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(alice, minterSellOfferIndex)); @@ -2070,7 +2071,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Becky buys the nft for XAU(10). Check balances. - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice)); env.close(); BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000)); @@ -2082,7 +2083,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(990)); // becky sells nft to carol. alice's balance goes up. - uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckySellOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(10)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(carol, beckySellOfferIndex)); @@ -2093,7 +2094,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(carol, gwXAU) == gwXAU(990)); // minter buys nft from carol. alice's balance goes up. - uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterBuyOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(10)), token::owner(carol)); env.close(); env(token::acceptBuyOffer(carol, minterBuyOfferIndex)); @@ -2106,7 +2107,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // minter sells the nft to alice. Because alice is part of the // transaction no transfer fee is removed. - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(10)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(alice, minterSellOfferIndex)); @@ -2151,7 +2152,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Becky buys the nft for XAU(10). Check balances. - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice)); env.close(); BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000)); @@ -2163,7 +2164,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(990)); // becky sells nft to minter. alice's balance goes up. - uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckySellOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, gwXAU(100)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(minter, beckySellOfferIndex)); @@ -2174,7 +2175,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(900)); // carol buys nft from minter. alice's balance goes up. - uint256 const carolBuyOfferIndex = keylet::nftoffer(carol, env.seq(carol)).key; + uint256 const carolBuyOfferIndex = keylet::nftokenOffer(carol, env.seq(carol)).key; env(token::createOffer(carol, nftID, gwXAU(10)), token::owner(minter)); env.close(); env(token::acceptBuyOffer(minter, carolBuyOfferIndex)); @@ -2187,7 +2188,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // carol sells the nft to alice. Because alice is part of the // transaction no transfer fee is removed. - uint256 const carolSellOfferIndex = keylet::nftoffer(carol, env.seq(carol)).key; + uint256 const carolSellOfferIndex = keylet::nftokenOffer(carol, env.seq(carol)).key; env(token::createOffer(carol, nftID, gwXAU(10)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(alice, carolSellOfferIndex)); @@ -2238,7 +2239,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice there should be no transfer fee. STAmount aliceBalance = env.balance(alice); STAmount minterBalance = env.balance(minter); - uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterBuyOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(1)), token::owner(alice)); env.close(); env(token::acceptBuyOffer(alice, minterBuyOfferIndex)); @@ -2252,7 +2253,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice does not get any transfer fee. auto pmt = NumberSwitchOver ? drops(50000) : drops(99999); STAmount carolBalance = env.balance(carol); - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, pmt), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(carol, minterSellOfferIndex)); @@ -2266,7 +2267,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // carol sells to becky. This is the smallest amount to pay for a // transfer that enables a transfer fee of 1 basis point. STAmount beckyBalance = env.balance(becky); - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; pmt = NumberSwitchOver ? drops(50001) : drops(100000); env(token::createOffer(becky, nftID, pmt), token::owner(carol)); env.close(); @@ -2311,7 +2312,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // alice there should be no transfer fee. STAmount aliceBalance = env.balance(alice, gwXAU); STAmount minterBalance = env.balance(minter, gwXAU); - uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterBuyOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, tinyXAU), token::owner(alice)); env.close(); env(token::acceptBuyOffer(alice, minterBuyOfferIndex)); @@ -2323,7 +2324,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // minter sells to carol. STAmount carolBalance = env.balance(carol, gwXAU); - uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterSellOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, tinyXAU), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(carol, minterSellOfferIndex)); @@ -2341,7 +2342,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite STAmount const cheapNFT(gwXAU, STAmount::cMinValue, STAmount::cMinOffset + 5); STAmount beckyBalance = env.balance(becky, gwXAU); - uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftID, cheapNFT), token::owner(carol)); env.close(); env(token::acceptBuyOffer(carol, beckyBuyOfferIndex)); @@ -2571,22 +2572,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Test how adding a Destination field to an offer affects permissions // for canceling offers. { - uint256 const offerMinterToIssuer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToIssuer = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(issuer), txflags(tfSellNFToken)); - uint256 const offerMinterToBuyer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToBuyer = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(buyer), txflags(tfSellNFToken)); - uint256 const offerIssuerToMinter = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerIssuerToMinter = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftokenID, drops(1)), token::owner(minter), token::destination(minter)); - uint256 const offerIssuerToBuyer = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerIssuerToBuyer = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftokenID, drops(1)), token::owner(minter), token::destination(buyer)); @@ -2627,7 +2628,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Test how adding a Destination field to a sell offer affects // accepting that offer. { - uint256 const offerMinterSellsToBuyer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterSellsToBuyer = + keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(buyer), txflags(tfSellNFToken)); @@ -2655,7 +2657,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Test how adding a Destination field to a buy offer affects // accepting that offer. { - uint256 const offerMinterBuysFromBuyer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterBuysFromBuyer = + keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::owner(buyer), token::destination(buyer)); @@ -2682,7 +2685,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // If a destination other than the NFToken owner is set, that // destination must act as a broker. The NFToken owner may not // simply accept the offer. - uint256 const offerBuyerBuysFromMinter = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerBuysFromMinter = + keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID, drops(1)), token::owner(minter), token::destination(broker)); @@ -2705,12 +2709,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Show that a sell offer's Destination can broker that sell offer // to another account. { - uint256 const offerMinterToBroker = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToBroker = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(broker), txflags(tfSellNFToken)); - uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerToMinter = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID, drops(1)), token::owner(minter)); env.close(); @@ -2742,15 +2746,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Destination doesn't match, but can complete if the Destination // does match. { - uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerToMinter = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID, drops(1)), token::destination(minter), txflags(tfSellNFToken)); - uint256 const offerMinterToBuyer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToBuyer = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::owner(buyer)); - uint256 const offerIssuerToBuyer = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerIssuerToBuyer = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftokenID, drops(1)), token::owner(buyer)); env.close(); @@ -2798,12 +2802,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Show that if a buy and a sell offer both have the same destination, // then that destination can broker the offers. { - uint256 const offerMinterToBroker = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToBroker = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(broker), txflags(tfSellNFToken)); - uint256 const offerBuyerToBroker = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerToBroker = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID, drops(1)), token::owner(minter), token::destination(broker)); @@ -2873,7 +2877,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // create offer (allowed now) then cancel { - uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(buyer), @@ -2886,7 +2890,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // create offer, enable flag, then cancel { - uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(buyer), @@ -2905,7 +2909,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // create offer then transfer { - uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID, drops(1)), token::destination(buyer), @@ -2992,23 +2996,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const offerMinterToIssuer = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToIssuer = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), token::destination(issuer), token::expiration(expiration), txflags(tfSellNFToken)); - uint256 const offerMinterToAnyone = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offerMinterToAnyone = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); - uint256 const offerIssuerToMinter = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerIssuerToMinter = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftokenID0, drops(1)), token::owner(minter), token::expiration(expiration)); - uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerToMinter = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, drops(1)), token::owner(minter), token::expiration(expiration)); @@ -3068,13 +3072,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const offer0 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offer0 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); minterCount++; - uint256 const offer1 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const offer1 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID1, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); @@ -3139,7 +3143,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Transfer nftokenID0 back to minter so we start the next test in // a simple place. - uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerSellBack = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, XRP(0)), txflags(tfSellNFToken), token::destination(minter)); @@ -3158,13 +3162,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const offer0 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offer0 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, drops(1)), token::owner(minter), token::expiration(expiration)); buyerCount++; - uint256 const offer1 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offer1 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID1, drops(1)), token::owner(minter), token::expiration(expiration)); @@ -3227,7 +3231,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Transfer nftokenID0 back to minter so we start the next test in // a simple place. - uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerSellBack = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, XRP(0)), txflags(tfSellNFToken), token::destination(minter)); @@ -3246,23 +3250,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer0 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); minterCount++; - uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer1 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID1, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); minterCount++; - uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer0 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, drops(1)), token::owner(minter)); buyerCount++; - uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer1 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID1, drops(1)), token::owner(minter)); buyerCount++; @@ -3321,7 +3325,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Transfer nftokenID0 back to minter so we start the next test in // a simple place. - uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerSellBack = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, XRP(0)), txflags(tfSellNFToken), token::destination(minter)); @@ -3340,18 +3344,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer0 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), txflags(tfSellNFToken)); - uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer1 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID1, drops(1)), txflags(tfSellNFToken)); - uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer0 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, drops(1)), token::expiration(expiration), token::owner(minter)); - uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer1 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID1, drops(1)), token::expiration(expiration), token::owner(minter)); @@ -3402,7 +3406,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Transfer nftokenID0 back to minter so we start the next test in // a simple place. - uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerSellBack = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, XRP(0)), txflags(tfSellNFToken), token::destination(minter)); @@ -3421,22 +3425,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { std::uint32_t const expiration = lastClose(env) + 25; - uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer0 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID0, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); - uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const sellOffer1 = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftokenID1, drops(1)), token::expiration(expiration), txflags(tfSellNFToken)); - uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer0 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, drops(1)), token::expiration(expiration), token::owner(minter)); - uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOffer1 = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID1, drops(1)), token::expiration(expiration), token::owner(minter)); @@ -3478,7 +3482,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Transfer nftokenID0 back to minter so we start the next test in // a simple place. - uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerSellBack = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftokenID0, XRP(0)), txflags(tfSellNFToken), token::destination(minter)); @@ -3516,7 +3520,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Anyone can cancel an expired offer. - uint256 const expiredOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const expiredOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftokenID, XRP(1000)), txflags(tfSellNFToken), @@ -3538,7 +3542,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Create a couple of offers with a destination. Those offers // should be cancellable by the creator and the destination. - uint256 const dest1OfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const dest1OfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftokenID, XRP(1000)), token::destination(becky), @@ -3556,7 +3560,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ownerCount(env, alice) == 1); // alice can cancel her own offer, even if becky is the destination. - uint256 const dest2OfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const dest2OfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftokenID, XRP(1000)), token::destination(becky), @@ -3575,7 +3579,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env(token::mint(minter, 0), token::issuer(alice), txflags(tfTransferable)); env.close(); - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, mintersNFTokenID, XRP(1000)), txflags(tfSellNFToken)); env.close(); @@ -3633,7 +3637,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env(token::mint(nftAcct, 0), token::uri(uri), txflags(tfTransferable)); env.close(); - offerIndexes.push_back(keylet::nftoffer(offerAcct, env.seq(offerAcct)).key); + offerIndexes.push_back(keylet::nftokenOffer(offerAcct, env.seq(offerAcct)).key); env(token::createOffer(offerAcct, nftokenID, drops(1)), token::owner(nftAcct), token::expiration(lastClose(env) + 5)); @@ -3646,7 +3650,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // All offers should be in the ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(env.le(keylet::nftokenOffer(offerIndex))); } // alice attempts to cancel all of the expired offers. There is one @@ -3659,7 +3663,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Verify that offer is gone from the ledger. - BEAST_EXPECT(!env.le(keylet::nftoffer(offerIndexes.back()))); + BEAST_EXPECT(!env.le(keylet::nftokenOffer(offerIndexes.back()))); offerIndexes.pop_back(); // But alice adds a sell offer to the list... @@ -3668,7 +3672,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env(token::mint(alice, 0), token::uri(uri), txflags(tfTransferable)); env.close(); - offerIndexes.push_back(keylet::nftoffer(alice, env.seq(alice)).key); + offerIndexes.push_back(keylet::nftokenOffer(alice, env.seq(alice)).key); env(token::createOffer(alice, nftokenID, drops(1)), txflags(tfSellNFToken)); env.close(); @@ -3698,7 +3702,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Verify that remaining offers are gone from the ledger. for (uint256 const& offerIndex : offerIndexes) { - BEAST_EXPECT(!env.le(keylet::nftoffer(offerIndex))); + BEAST_EXPECT(!env.le(keylet::nftokenOffer(offerIndex))); } } @@ -3779,13 +3783,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); // buyer creates their offer. Note: a buy offer can never // offer zero. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter)); env.close(); @@ -3821,13 +3825,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); // buyer creates their offer. Note: a buy offer can never // offer zero. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter)); env.close(); @@ -3870,13 +3874,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(maxTransferFee); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); // buyer creates their offer. Note: a buy offer can never // offer zero. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter)); env.close(); @@ -3912,13 +3916,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(maxTransferFee); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken)); env.close(); // buyer creates their offer. Note: a buy offer can never // offer zero. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter)); env.close(); @@ -3985,14 +3989,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(1000)), txflags(tfSellNFToken)); env.close(); { // buyer creates an offer for more XAU than they currently // own. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1001)), token::owner(minter)); env.close(); @@ -4009,7 +4013,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { // buyer creates an offer for less that what minter is // asking. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(999)), token::owner(minter)); env.close(); @@ -4025,7 +4029,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite } // buyer creates a large enough offer. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter)); env.close(); @@ -4062,13 +4066,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(maxTransferFee); // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken)); env.close(); { // buyer creates an offer for more XAU than they currently // own. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1001)), token::owner(minter)); env.close(); @@ -4085,7 +4089,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { // buyer creates an offer for less that what minter is // asking. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(899)), token::owner(minter)); env.close(); @@ -4100,7 +4104,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); } // buyer creates a large enough offer. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter)); env.close(); @@ -4140,12 +4144,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(maxTransferFee / 2); // 25% // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken)); env.close(); // buyer creates a large enough offer. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter)); env.close(); @@ -4177,12 +4181,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const nftID = mintNFT(maxTransferFee / 2); // 25% // minter creates their offer. - uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key; + uint256 const minterOfferIndex = keylet::nftokenOffer(minter, env.seq(minter)).key; env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken)); env.close(); // buyer creates a large enough offer. - uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter)); env.close(); @@ -4232,9 +4236,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(nftCount(env, buyer2) == 0); // Both buyer1 and buyer2 create buy offers for nftId. - uint256 const buyer1OfferIndex = keylet::nftoffer(buyer1, env.seq(buyer1)).key; + uint256 const buyer1OfferIndex = keylet::nftokenOffer(buyer1, env.seq(buyer1)).key; env(token::createOffer(buyer1, nftId, XRP(100)), token::owner(issuer)); - uint256 const buyer2OfferIndex = keylet::nftoffer(buyer2, env.seq(buyer2)).key; + uint256 const buyer2OfferIndex = keylet::nftokenOffer(buyer2, env.seq(buyer2)).key; env(token::createOffer(buyer2, nftId, XRP(100)), token::owner(issuer)); env.close(); @@ -4322,7 +4326,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // NFTokenCreateOffer BEAST_EXPECT(ownerCount(env, buyer) == 10); - uint256 const offerIndex0 = keylet::nftoffer(buyer, buyerTicketSeq).key; + uint256 const offerIndex0 = keylet::nftokenOffer(buyer, buyerTicketSeq).key; env(token::createOffer(buyer, nftId, XRP(1)), token::owner(issuer), ticket::use(buyerTicketSeq++)); @@ -4337,7 +4341,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite BEAST_EXPECT(ticketCount(env, buyer) == 8); // NFTokenCreateOffer. buyer tries again. - uint256 const offerIndex1 = keylet::nftoffer(buyer, buyerTicketSeq).key; + uint256 const offerIndex1 = keylet::nftokenOffer(buyer, buyerTicketSeq).key; env(token::createOffer(buyer, nftId, XRP(2)), token::owner(issuer), ticket::use(buyerTicketSeq++)); @@ -4414,7 +4418,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env(token::createOffer(becky, nftId, XRP(2)), token::owner(minter)); env.close(); - uint256 const carlaOfferIndex = keylet::nftoffer(carla, env.seq(carla)).key; + uint256 const carlaOfferIndex = keylet::nftokenOffer(carla, env.seq(carla)).key; env(token::createOffer(carla, nftId, XRP(3)), token::owner(minter)); env.close(); @@ -4692,25 +4696,25 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite TER const offerCreateTER = temBAD_AMOUNT; // Make offers with negative amounts for the NFTs - uint256 const sellNegXrpOfferIndex = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const sellNegXrpOfferIndex = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftID0, XRP(-2)), txflags(tfSellNFToken), ter(offerCreateTER)); env.close(); - uint256 const sellNegIouOfferIndex = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const sellNegIouOfferIndex = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftID1, gwXAU(-2)), txflags(tfSellNFToken), ter(offerCreateTER)); env.close(); - uint256 const buyNegXrpOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyNegXrpOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID0, XRP(-1)), token::owner(issuer), ter(offerCreateTER)); env.close(); - uint256 const buyNegIouOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const buyNegIouOfferIndex = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::createOffer(buyer, nftID1, gwXAU(-1)), token::owner(issuer), ter(offerCreateTER)); @@ -4873,7 +4877,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const& nftID, STAmount const& amount, std::optional const terCode = {}) { - uint256 const offerID = keylet::nftoffer(offerer, env.seq(offerer)).key; + uint256 const offerID = keylet::nftokenOffer(offerer, env.seq(offerer)).key; env(token::createOffer(offerer, nftID, amount), token::owner(owner), terCode ? ter(*terCode) : ter(static_cast(tesSUCCESS))); @@ -4886,7 +4890,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite uint256 const& nftID, STAmount const& amount, std::optional const terCode = {}) { - uint256 const offerID = keylet::nftoffer(offerer, env.seq(offerer)).key; + uint256 const offerID = keylet::nftokenOffer(offerer, env.seq(offerer)).key; env(token::createOffer(offerer, nftID, amount), txflags(tfSellNFToken), terCode ? ter(*terCode) : ter(static_cast(tesSUCCESS))); @@ -5399,10 +5403,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Bob creates a buy offer for 5 XRP. Alice creates a sell offer // for 0 XRP. - uint256 const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const bobBuyOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, XRP(5)), token::owner(alice)); - uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceSellOfferIndex = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, XRP(0)), token::destination(bob), txflags(tfSellNFToken)); @@ -5413,10 +5417,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Note that bob still has a buy offer on the books. - BEAST_EXPECT(env.le(keylet::nftoffer(bobBuyOfferIndex))); + BEAST_EXPECT(env.le(keylet::nftokenOffer(bobBuyOfferIndex))); // Bob creates a sell offer for the gift NFT from alice. - uint256 const bobSellOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const bobSellOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, XRP(4)), txflags(tfSellNFToken)); env.close(); @@ -6033,7 +6037,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite token::amount(XRP(10)), token::destination(buyer), token::expiration(lastClose(env) + 25)); - uint256 const offerAliceSellsToBuyer = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const offerAliceSellsToBuyer = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::cancelOffer(alice, {offerAliceSellsToBuyer})); env.close(); @@ -6042,7 +6046,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite token::amount(XRP(10)), token::destination(alice), token::expiration(lastClose(env) + 25)); - uint256 const offerBuyerSellsToAlice = keylet::nftoffer(buyer, env.seq(buyer)).key; + uint256 const offerBuyerSellsToAlice = keylet::nftokenOffer(buyer, env.seq(buyer)).key; env(token::cancelOffer(alice, {offerBuyerSellsToAlice})); env.close(); @@ -6190,12 +6194,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Alice creates one sell offer for each NFT // Verify the offer indexes are correct in the NFTokenCreateOffer tx // meta - uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex1 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId1, drops(1)), txflags(tfSellNFToken)); env.close(); verifyNFTokenOfferID(aliceOfferIndex1); - uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex2 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId2, drops(1)), txflags(tfSellNFToken)); env.close(); verifyNFTokenOfferID(aliceOfferIndex2); @@ -6209,7 +6213,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // Bobs creates a buy offer for nftId1 // Verify the offer id is correct in the NFTokenCreateOffer tx meta - auto const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + auto const bobBuyOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId1, drops(1)), token::owner(alice)); env.close(); verifyNFTokenOfferID(bobBuyOfferIndex); @@ -6230,7 +6234,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite verifyNFTokenID(nftId); // Alice creates sell offer and set broker as destination - uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const offerAliceToBroker = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), token::destination(broker), txflags(tfSellNFToken)); @@ -6238,7 +6242,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite verifyNFTokenOfferID(offerAliceToBroker); // Bob creates buy offer - uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const offerBobToBroker = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, drops(1)), token::owner(alice)); env.close(); verifyNFTokenOfferID(offerBobToBroker); @@ -6259,12 +6263,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite verifyNFTokenID(nftId); // Alice creates 2 sell offers for the same NFT - uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex1 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken)); env.close(); verifyNFTokenOfferID(aliceOfferIndex1); - uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex2 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken)); env.close(); verifyNFTokenOfferID(aliceOfferIndex2); @@ -6278,7 +6282,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite if (features[featureNFTokenMintOffer]) { - uint256 const aliceMintWithOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceMintWithOfferIndex1 = + keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::mint(alice), token::amount(XRP(0))); env.close(); verifyNFTokenOfferID(aliceMintWithOfferIndex1); @@ -6301,7 +6306,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // acct makes an sell offer - uint256 const sellOfferIndex = keylet::nftoffer(acct, env.seq(acct)).key; + uint256 const sellOfferIndex = keylet::nftokenOffer(acct, env.seq(acct)).key; env(token::createOffer(acct, nftId, amt), txflags(tfSellNFToken)); env.close(); @@ -6506,7 +6511,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Bob makes a buy offer for 1 XRP - auto const buyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + auto const buyOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, XRP(1)), token::owner(alice)); env.close(); @@ -6554,14 +6559,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); // Alice creates sell offer and set broker as destination - uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const offerAliceToBroker = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, XRP(1)), token::destination(broker), txflags(tfSellNFToken)); env.close(); // Bob creates buy offer - uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const offerBobToBroker = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, XRP(1)), token::owner(alice)); env.close(); @@ -6655,10 +6660,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // becky buys the nfts for 1 drop each. { - uint256 const beckyBuyOfferIndex1 = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex1 = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(issuer)); - uint256 const beckyBuyOfferIndex2 = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex2 = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(issuer)); env.close(); @@ -6668,7 +6673,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite } // becky creates offers to sell the nfts for AUD. - uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyAutoTrustOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), txflags(tfSellNFToken)); env.close(); @@ -6686,7 +6692,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite env.close(); BEAST_EXPECT(ownerCount(env, issuer) == 1); - uint256 const beckyNoAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyNoAutoTrustOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)), txflags(tfSellNFToken)); env.close(); @@ -6810,10 +6817,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // becky buys the nfts for 1 drop each. { - uint256 const beckyBuyOfferIndex1 = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex1 = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(issuer)); - uint256 const beckyBuyOfferIndex2 = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyBuyOfferIndex2 = keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(issuer)); env.close(); @@ -6840,7 +6847,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite // However if the NFToken has the tfTrustLine flag set, // then becky can create the offer. - uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyAutoTrustOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, isISU(100)), txflags(tfSellNFToken)); env.close(); @@ -6857,10 +6865,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite { // With featureNFTokenMintOffer things go better. // becky creates offers to sell the nfts for ISU. - uint256 const beckyNoAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyNoAutoTrustOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftNoAutoTrustID, isISU(100)), txflags(tfSellNFToken)); env.close(); - uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key; + uint256 const beckyAutoTrustOfferIndex = + keylet::nftokenOffer(becky, env.seq(becky)).key; env(token::createOffer(becky, nftAutoTrustID, isISU(100)), txflags(tfSellNFToken)); env.close(); @@ -7094,7 +7104,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite checkURI(issuer, "uri", __LINE__); // Account != Owner - uint256 const offerID = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerID = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftId, XRP(0)), txflags(tfSellNFToken)); env.close(); env(token::acceptSellOffer(alice, offerID)); diff --git a/src/test/rpc/LedgerEntry_test.cpp b/src/test/rpc/LedgerEntry_test.cpp index f50b32e4a8..111cb39fc4 100644 --- a/src/test/rpc/LedgerEntry_test.cpp +++ b/src/test/rpc/LedgerEntry_test.cpp @@ -1527,7 +1527,7 @@ class LedgerEntry_test : public beast::unit_test::suite uint256 const nftokenID0 = token::getNextID(env, issuer, 0, tfTransferable); env(token::mint(issuer, 0), txflags(tfTransferable)); env.close(); - uint256 const offerID = keylet::nftoffer(issuer, env.seq(issuer)).key; + uint256 const offerID = keylet::nftokenOffer(issuer, env.seq(issuer)).key; env(token::createOffer(issuer, nftokenID0, drops(1)), token::destination(buyer), txflags(tfSellNFToken)); diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp index 0e43713c2a..0bb202f567 100644 --- a/src/test/rpc/Subscribe_test.cpp +++ b/src/test/rpc/Subscribe_test.cpp @@ -1451,12 +1451,12 @@ public: // Alice creates one sell offer for each NFT // Verify the offer indexes are correct in the NFTokenCreateOffer tx // meta - uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex1 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId1, drops(1)), txflags(tfSellNFToken)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(aliceOfferIndex1); - uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex2 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId2, drops(1)), txflags(tfSellNFToken)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(aliceOfferIndex2); @@ -1470,7 +1470,7 @@ public: // Bobs creates a buy offer for nftId1 // Verify the offer id is correct in the NFTokenCreateOffer tx meta - auto const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key; + auto const bobBuyOfferIndex = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId1, drops(1)), token::owner(alice)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(bobBuyOfferIndex); @@ -1491,7 +1491,7 @@ public: verifyNFTokenID(nftId); // Alice creates sell offer and set broker as destination - uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const offerAliceToBroker = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), token::destination(broker), txflags(tfSellNFToken)); @@ -1499,7 +1499,7 @@ public: verifyNFTokenOfferID(offerAliceToBroker); // Bob creates buy offer - uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key; + uint256 const offerBobToBroker = keylet::nftokenOffer(bob, env.seq(bob)).key; env(token::createOffer(bob, nftId, drops(1)), token::owner(alice)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(offerBobToBroker); @@ -1520,12 +1520,12 @@ public: verifyNFTokenID(nftId); // Alice creates 2 sell offers for the same NFT - uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex1 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(aliceOfferIndex1); - uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceOfferIndex2 = keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken)); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(aliceOfferIndex2); @@ -1539,7 +1539,8 @@ public: if (features[featureNFTokenMintOffer]) { - uint256 const aliceMintWithOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key; + uint256 const aliceMintWithOfferIndex1 = + keylet::nftokenOffer(alice, env.seq(alice)).key; env(token::mint(alice), token::amount(XRP(0))); BEAST_EXPECT(env.syncClose()); verifyNFTokenOfferID(aliceMintWithOfferIndex1); diff --git a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h index 8f68aeaadd..0d63454e2b 100644 --- a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h +++ b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h @@ -81,7 +81,7 @@ enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const if (!startAfter.parseHex(marker.asString())) return rpcError(rpcINVALID_PARAMS); - auto const sle = ledger->read(keylet::nftoffer(startAfter)); + auto const sle = ledger->read(keylet::nftokenOffer(startAfter)); if (!sle || nftId != sle->getFieldH256(sfNFTokenID)) return rpcError(rpcINVALID_PARAMS);