ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-08-19 03:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: ripple_flag logic in account lines (#1969)"

Browse Source 
This reverts commit df3f1865ae.
This commit is contained in:
Sergey Kuznetsov
2025-05-16 17:20:41 +01:00
parent 565aadd3b2
commit db4fc6a07d
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rpc/handlers/AccountLines.cpp
View File

@@ -103,12 +103,6 @@ AccountLinesHandler::addLine(
line.qualityIn = lineQualityIn;
line.qualityOut = lineQualityOut;
if (lineNoRipple)
line.noRipple = true;
if (lineNoRipplePeer)
line.noRipplePeer = true;
if (lineAuth)
line.authorized = true;
@@ -127,6 +121,8 @@ AccountLinesHandler::addLine(
if (lineDeepFreezePeer)
line.deepFreezePeer = true;
line.noRipple = lineNoRipple;
line.noRipplePeer = lineNoRipplePeer;
lines.push_back(line);
}
@@ -262,11 +258,8 @@ tag_invoke(
{JS(quality_out), line.qualityOut},
};
if (line.noRipple)
obj[JS(no_ripple)] = *(line.noRipple);
if (line.noRipplePeer)
obj[JS(no_ripple_peer)] = *(line.noRipplePeer);
obj[JS(no_ripple)] = line.noRipple;
obj[JS(no_ripple_peer)] = line.noRipplePeer;
if (line.authorized)
obj[JS(authorized)] = *(line.authorized);

4
src/rpc/handlers/AccountLines.hpp
View File

@@ -70,8 +70,8 @@ public:
std::string limitPeer;
uint32_t qualityIn{};
uint32_t qualityOut{};
std::optional<bool> noRipple;
std::optional<bool> noRipplePeer;
bool noRipple{};
bool noRipplePeer{};
std::optional<bool> authorized;
std::optional<bool> peerAuthorized;
std::optional<bool> freeze;

26
tests/unit/rpc/handlers/AccountLinesTests.cpp
View File

@@ -523,7 +523,9 @@ TEST_F(RPCAccountLinesHandlerTest, DefaultParameterTest)
"limit": "100",
"limit_peer": "200",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
},
{
"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
@@ -532,7 +534,9 @@ TEST_F(RPCAccountLinesHandlerTest, DefaultParameterTest)
"limit": "200",
"limit_peer": "100",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
}
]
})";
@@ -734,6 +738,7 @@ TEST_F(RPCAccountLinesHandlerTest, OptionalResponseFieldWithDeepFreeze)
"limit_peer": "200",
"quality_in": 0,
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": true,
"peer_authorized": true,
"freeze_peer": true,
@@ -748,6 +753,7 @@ TEST_F(RPCAccountLinesHandlerTest, OptionalResponseFieldWithDeepFreeze)
"quality_in": 0,
"quality_out": 0,
"no_ripple": true,
"no_ripple_peer": false,
"authorized": true,
"freeze": true,
"deep_freeze": true
@@ -1067,7 +1073,9 @@ TEST_F(RPCAccountLinesHandlerTest, LimitLessThanMin)
"limit": "100",
"limit_peer": "200",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
}},
{{
"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
@@ -1076,7 +1084,9 @@ TEST_F(RPCAccountLinesHandlerTest, LimitLessThanMin)
"limit": "200",
"limit_peer": "100",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
}}
]
}})",
@@ -1144,7 +1154,9 @@ TEST_F(RPCAccountLinesHandlerTest, LimitMoreThanMax)
"limit": "100",
"limit_peer": "200",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
}},
{{
"account": "rLEsXccBGNR3UPuPu2hUXPjziKC3qKSBun",
@@ -1153,7 +1165,9 @@ TEST_F(RPCAccountLinesHandlerTest, LimitMoreThanMax)
"limit": "200",
"limit_peer": "100",
"quality_in": 0,
"quality_out": 0
"quality_out": 0,
"no_ripple": false,
"no_ripple_peer": false
}}
]
}})",