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

account_flags (#745)

Browse Source 
Fixes #746
This commit is contained in:
cyan317
2023-07-10 13:01:33 +01:00
committed by GitHub
parent 616f0176c9
commit f19772907d
2 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rpc/handlers/AccountInfo.cpp
View File

@@ -89,6 +89,30 @@ tag_invoke(boost::json::value_from_tag, boost::json::value& jv, AccountInfoHandl
{JS(validated), output.validated}, {JS(validated), output.validated},
}; };
static constexpr std::array<std::pair<std::string_view, ripple::LedgerSpecificFlags>, 9> lsFlags{{
{"defaultRipple", ripple::lsfDefaultRipple},
{"depositAuth", ripple::lsfDepositAuth},
{"disableMasterKey", ripple::lsfDisableMaster},
{"disallowIncomingXRP", ripple::lsfDisallowXRP},
{"globalFreeze", ripple::lsfGlobalFreeze},
{"noFreeze", ripple::lsfNoFreeze},
{"passwordSpent", ripple::lsfPasswordSpent},
{"requireAuthorization", ripple::lsfRequireAuth},
{"requireDestinationTag", ripple::lsfRequireDestTag}
// TODO: wait for conan integration
// {"disallowIncomingNFTokenOffer", ripple::lsfDisallowIncomingNFTokenOffer},
// {"disallowIncomingCheck", ripple::lsfDisallowIncomingCheck},
// {"disallowIncomingPayChan", ripple::lsfDisallowIncomingPayChan},
// {"disallowIncomingTrustline", ripple::lsfDisallowIncomingTrustline}
}};
boost::json::object acctFlags;
for (auto const& lsf : lsFlags)
acctFlags[lsf.first.data()] = output.accountData.isFlag(lsf.second);
// wait for conan integration-> jss::account_flags
jv.as_object()["account_flags"] = std::move(acctFlags);
if (output.signerLists) if (output.signerLists)
{ {
auto signers = boost::json::array(); auto signers = boost::json::array();

81
unittests/rpc/handlers/AccountInfoTest.cpp
View File

@@ -333,6 +333,17 @@ TEST_F(RPCAccountInfoHandlerTest, SignerListsTrue)
}} }}
] ]
}}, }},
"account_flags": {{
"defaultRipple": false,
"depositAuth": false,
"disableMasterKey": false,
"disallowIncomingXRP": false,
"globalFreeze": false,
"noFreeze": false,
"passwordSpent": false,
"requireAuthorization": false,
"requireDestinationTag": false
}},
"ledger_hash":"{}", "ledger_hash":"{}",
"ledger_index":30, "ledger_index":30,
"validated":true "validated":true
@@ -373,6 +384,76 @@ TEST_F(RPCAccountInfoHandlerTest, SignerListsTrue)
}); });
} }
TEST_F(RPCAccountInfoHandlerTest, Flags)
{
auto const expectedOutput = fmt::format(
R"({{
"account_data":{{
"Account":"{}",
"Balance":"200",
"Flags":33488896,
"LedgerEntryType":"AccountRoot",
"OwnerCount":2,
"PreviousTxnID":"{}",
"PreviousTxnLgrSeq":2,
"Sequence":2,
"TransferRate":0,
"index":"13F1A95D7AAB7108D5CE7EEAF504B2894B8C674E6D68499076441C4837282BF8"
}},
"account_flags": {{
"defaultRipple": true,
"depositAuth": true,
"disableMasterKey": true,
"disallowIncomingXRP": true,
"globalFreeze": true,
"noFreeze": true,
"passwordSpent": true,
"requireAuthorization": true,
"requireDestinationTag": true
}},
"ledger_hash":"{}",
"ledger_index":30,
"validated":true
}})",
ACCOUNT,
INDEX1,
LEDGERHASH);
auto const rawBackendPtr = static_cast<MockBackend*>(mockBackendPtr.get());
mockBackendPtr->updateRange(10); // min
mockBackendPtr->updateRange(30); // max
auto const ledgerinfo = CreateLedgerInfo(LEDGERHASH, 30);
EXPECT_CALL(*rawBackendPtr, fetchLedgerBySequence).Times(1);
ON_CALL(*rawBackendPtr, fetchLedgerBySequence).WillByDefault(Return(ledgerinfo));
auto const account = GetAccountIDWithString(ACCOUNT);
auto const accountKk = ripple::keylet::account(account).key;
auto const accountRoot = CreateAccountRootObject(
ACCOUNT,
ripple::lsfDefaultRipple | ripple::lsfGlobalFreeze | ripple::lsfRequireDestTag | ripple::lsfRequireAuth |
ripple::lsfDepositAuth | ripple::lsfDisableMaster | ripple::lsfDisallowXRP | ripple::lsfNoFreeze |
ripple::lsfPasswordSpent,
2,
200,
2,
INDEX1,
2);
ON_CALL(*rawBackendPtr, doFetchLedgerObject(accountKk, 30, _))
.WillByDefault(Return(accountRoot.getSerializer().peekData()));
EXPECT_CALL(*rawBackendPtr, doFetchLedgerObject).Times(1);
auto const static input = boost::json::parse(fmt::format(
R"({{
"account":"{}"
}})",
ACCOUNT));
auto const handler = AnyHandler{AccountInfoHandler{mockBackendPtr}};
runSpawn([&](auto& yield) {
auto const output = handler.process(input, Context{std::ref(yield)});
ASSERT_TRUE(output);
EXPECT_EQ(*output, json::parse(expectedOutput));
});
}
TEST_F(RPCAccountInfoHandlerTest, StrictTrue) TEST_F(RPCAccountInfoHandlerTest, StrictTrue)
{ {
auto const rawBackendPtr = static_cast<MockBackend*>(mockBackendPtr.get()); auto const rawBackendPtr = static_cast<MockBackend*>(mockBackendPtr.get());