ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'NFT' to 'NFToken' in DisallowIncoming flags (#4442)

Browse Source 
* Follow-up to #4336
* NFToken is the naming convention in the codebase (rather than NFT)
* Rename `lsfDisallowIncomingNFTOffer` to `lsfDisallowIncomingNFTokenOffer`
* Rename `asfDisallowIncomingNFTOffer` to `asfDisallowIncomingNFTokenOffer`
This commit is contained in:
Kenny Lei
2023-03-02 13:01:50 -08:00
committed by GitHub
parent c77a8d5ec6
commit ecd49e1535
6 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3028,11 +3028,11 @@ class NFToken_test : public beast::unit_test::suite
Env env{*this, features - disallowIncoming};
Account const alice{"alice"};
env.fund(XRP(10000), alice);
env(fset(alice, asfDisallowIncomingNFTOffer));
env(fset(alice, asfDisallowIncomingNFTokenOffer));
env.close();
auto const sle = env.le(alice);
uint32_t flags = sle->getFlags();
BEAST_EXPECT(!(flags & lsfDisallowIncomingNFTOffer));
BEAST_EXPECT(!(flags & lsfDisallowIncomingNFTokenOffer));
}
Env env{*this, features | disallowIncoming};
@@ -3055,7 +3055,7 @@ class NFToken_test : public beast::unit_test::suite
env.close();
// enable flag
env(fset(buyer, asfDisallowIncomingNFTOffer));
env(fset(buyer, asfDisallowIncomingNFTokenOffer));
env.close();
// a sell offer from the minter to the buyer should be rejected
@@ -3071,7 +3071,7 @@ class NFToken_test : public beast::unit_test::suite
}
// disable the flag
env(fclear(buyer, asfDisallowIncomingNFTOffer));
env(fclear(buyer, asfDisallowIncomingNFTokenOffer));
env.close();
// create offer (allowed now) then cancel
@@ -3098,13 +3098,13 @@ class NFToken_test : public beast::unit_test::suite
txflags(tfSellNFToken));
env.close();
env(fset(buyer, asfDisallowIncomingNFTOffer));
env(fset(buyer, asfDisallowIncomingNFTokenOffer));
env.close();
env(token::cancelOffer(minter, {offerIndex}));
env.close();
env(fclear(buyer, asfDisallowIncomingNFTOffer));
env(fclear(buyer, asfDisallowIncomingNFTokenOffer));
env.close();
}
@@ -3125,7 +3125,7 @@ class NFToken_test : public beast::unit_test::suite
// buyer now owns the token
// enable flag again
env(fset(buyer, asfDisallowIncomingNFTOffer));
env(fset(buyer, asfDisallowIncomingNFTokenOffer));
env.close();
// a random offer to buy the token

2
src/test/rpc/AccountSet_test.cpp
View File

@@ -86,7 +86,7 @@ public:
if (flag == asfDisallowIncomingCheck ||
flag == asfDisallowIncomingPayChan ||
flag == asfDisallowIncomingNFTOffer ||
flag == asfDisallowIncomingNFTokenOffer ||
flag == asfDisallowIncomingTrustline)
{
// These flags are part of the DisallowIncoming amendment