ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-21 20:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix noRippleCheck fee field (#786)

Browse Source 
Fixes #709
This commit is contained in:
Arihant Kothari
2023-07-26 14:22:17 -04:00
committed by GitHub
parent 71aabc8c29
commit 1d0a43669b
6 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/BackendInterface.cpp
View File

@@ -308,10 +308,6 @@ BackendInterface::fetchFees(std::uint32_t const seq, boost::asio::yield_context&
if (sle.getFieldIndex(ripple::sfBaseFee) != -1)
fees.base = sle.getFieldU64(ripple::sfBaseFee);
// deprecated?
// if (sle.getFieldIndex(ripple::sfReferenceFeeUnits) != -1)
// fees.units = sle.getFieldU32(ripple::sfReferenceFeeUnits);
if (sle.getFieldIndex(ripple::sfReserveBase) != -1)
fees.reserve = sle.getFieldU32(ripple::sfReserveBase);

6
src/rpc/handlers/NoRippleCheck.cpp
View File

@@ -46,8 +46,7 @@ NoRippleCheckHandler::process(NoRippleCheckHandler::Input input, Context const&
auto sle = ripple::SLE{it, keylet};
auto accountSeq = sle.getFieldU32(ripple::sfSequence);
bool const bDefaultRipple = sle.getFieldU32(ripple::sfFlags) & ripple::lsfDefaultRipple;
// TODO: remove if no longer needed
// auto const fees = input.transactions ? sharedPtrBackend_->fetchFees(lgrInfo.seq, ctx.yield) : std::nullopt;
auto const fees = input.transactions ? sharedPtrBackend_->fetchFees(lgrInfo.seq, ctx.yield) : std::nullopt;
auto output = NoRippleCheckHandler::Output();
@@ -58,8 +57,7 @@ NoRippleCheckHandler::process(NoRippleCheckHandler::Input input, Context const&
boost::json::object tx;
tx[JS(Sequence)] = accountSeq;
tx[JS(Account)] = ripple::toBase58(accountID);
// TODO: deprecated?
// tx[JS(Fee)] = toBoostJson(fees->units.jsonClipped());
tx[JS(Fee)] = toBoostJson(fees->base.jsonClipped());
return tx;
};

2
src/subscriptions/SubscriptionManager.cpp
View File

@@ -53,8 +53,6 @@ getLedgerPubMessage(
pubMsg["ledger_hash"] = to_string(lgrInfo.hash);
pubMsg["ledger_time"] = lgrInfo.closeTime.time_since_epoch().count();
// deprecated?
// pubMsg["fee_ref"] = RPC::toBoostJson(fees.units.jsonClipped());
pubMsg["fee_base"] = RPC::toBoostJson(fees.base.jsonClipped());
pubMsg["reserve_base"] = RPC::toBoostJson(fees.reserve.jsonClipped());
pubMsg["reserve_inc"] = RPC::toBoostJson(fees.increment.jsonClipped());

2
unittests/SubscriptionManagerTest.cpp
View File

@@ -302,7 +302,6 @@ TEST_F(SubscriptionManagerSimpleBackendTest, SubscriptionManagerLedger)
"ledger_index":30,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
"ledger_time":0,
"fee_ref":4,
"fee_base":1,
"reserve_base":3,
"reserve_inc":2
@@ -323,7 +322,6 @@ TEST_F(SubscriptionManagerSimpleBackendTest, SubscriptionManagerLedger)
"ledger_index":31,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
"ledger_time":0,
"fee_ref":0,
"fee_base":0,
"reserve_base":10,
"reserve_inc":0,

6
unittests/rpc/handlers/NoRippleCheckTest.cpp
View File

@@ -616,14 +616,14 @@ TEST_F(RPCNoRippleCheckTest, NormalPathTransactions)
{{
"Sequence":{},
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
"Fee":4,
"Fee":1,
"TransactionType":"AccountSet",
"SetFlag":8
}},
{{
"Sequence":{},
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
"Fee":4,
"Fee":1,
"TransactionType":"TrustSet",
"LimitAmount":{{
"currency":"USD",
@@ -635,7 +635,7 @@ TEST_F(RPCNoRippleCheckTest, NormalPathTransactions)
{{
"Sequence":{},
"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
"Fee":4,
"Fee":1,
"TransactionType":"TrustSet",
"LimitAmount":{{
"currency":"USD",

2
unittests/rpc/handlers/SubscribeTest.cpp
View File

@@ -588,7 +588,6 @@ TEST_F(RPCSubscribeHandlerTest, StreamsLedger)
"ledger_index":30,
"ledger_hash":"4BC50C9B0D8515D3EAAE1E74B29A95804346C491EE1A95BF25E4AAB854A6A652",
"ledger_time":0,
"fee_ref":4,
"fee_base":1,
"reserve_base":3,
"reserve_inc":2
@@ -615,7 +614,6 @@ TEST_F(RPCSubscribeHandlerTest, StreamsLedger)
auto const handler = AnyHandler{SubscribeHandler{mockBackendPtr, subManager_}};
auto const output = handler.process(input, Context{std::ref(yield), session_});
ASSERT_TRUE(output);
// FIXME: fee_ref is missing now. this is possibly correct. need to confirm:
EXPECT_EQ(output->as_object(), json::parse(expectedOutput));
std::this_thread::sleep_for(20ms);
auto const report = subManager_->report();