From db4fc6a07d330dcfdcb3ae87637b7d4035365bdb Mon Sep 17 00:00:00 2001
From: Sergey Kuznetsov <skuznetsov@ripple.com>
Date: Fri, 16 May 2025 17:20:41 +0100
Subject: [PATCH] Revert "fix: ripple_flag logic in account lines (#1969)"

This reverts commit df3f1865aec7abc509d6d7788cf6ad89866583af.
---
 src/rpc/handlers/AccountLines.cpp             | 15 +++--------
 src/rpc/handlers/AccountLines.hpp             |  4 +--
 tests/unit/rpc/handlers/AccountLinesTests.cpp | 26 ++++++++++++++-----
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/rpc/handlers/AccountLines.cpp b/src/rpc/handlers/AccountLines.cpp
index 6459e27d6..ae9a0b237 100644
--- a/src/rpc/handlers/AccountLines.cpp
+++ b/src/rpc/handlers/AccountLines.cpp
@@ -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);
diff --git a/src/rpc/handlers/AccountLines.hpp b/src/rpc/handlers/AccountLines.hpp
index 38d6f5231..3388f3166 100644
--- a/src/rpc/handlers/AccountLines.hpp
+++ b/src/rpc/handlers/AccountLines.hpp
@@ -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;
diff --git a/tests/unit/rpc/handlers/AccountLinesTests.cpp b/tests/unit/rpc/handlers/AccountLinesTests.cpp
index 1b774fd49..52061631d 100644
--- a/tests/unit/rpc/handlers/AccountLinesTests.cpp
+++ b/tests/unit/rpc/handlers/AccountLinesTests.cpp
@@ -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
                     }}
                 ]
             }})",