[PATCH b4 05/27] review: drop the unused return value from set_flags_bulk()

[Christian Brauner <brauner@kernel.org>]

set_flags_bulk() returns the number of messages that didn't already
carry the flag. Nothing uses it. The unread badge accounting it was
added for ended up taking its count from get_flags_bulk() instead, over
the messages that are new to the thread, which is a different number.

An unused return value still reads like a contract callers may rely on
and the next person has to work out that none do. Take it back out. Keep
the early continue it brought with it. A row the INSERT just created
already carries exactly this flag, so there is nothing for the
read-modify-write below to do.

Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
---
 src/b4/review/messages.py  |  8 ++------
 src/tests/test_messages.py | 44 --------------------------------------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/src/b4/review/messages.py b/src/b4/review/messages.py
index a73e986..b388d93 100644
--- a/src/b4/review/messages.py
+++ b/src/b4/review/messages.py
@@ -102,13 +102,11 @@ def set_flag(
 
 def set_flags_bulk(
     conn: sqlite3.Connection, entries: List[Dict[str, Optional[str]]], flag: str
-) -> int:
+) -> None:
     """Add *flag* to multiple messages in one transaction.
 
     Each entry in *entries* is ``{'msgid': ..., 'msg_date': ...}``.
-    Returns the number of messages that did not have *flag* before.
     """
-    newly_flagged = 0
     for entry in entries:
         msgid = entry.get('msgid', '')
         msg_date = entry.get('msg_date')
@@ -121,7 +119,7 @@ def set_flags_bulk(
             (msgid, msg_date, flag),
         )
         if cursor.rowcount > 0:
-            newly_flagged += 1
+            # Row created carrying exactly this flag; nothing to merge
             continue
         row = conn.execute(
             'SELECT flags FROM messages WHERE msgid = ?', (msgid,)
@@ -130,13 +128,11 @@ def set_flags_bulk(
             existing = set(row[0].split())
             if flag not in existing:
                 existing.add(flag)
-                newly_flagged += 1
                 conn.execute(
                     'UPDATE messages SET flags = ? WHERE msgid = ?',
                     (' '.join(sorted(existing)), msgid),
                 )
     conn.commit()
-    return newly_flagged
 
 
 def remove_flag(conn: sqlite3.Connection, msgid: str, flag: str) -> None:
diff --git a/src/tests/test_messages.py b/src/tests/test_messages.py
index 904776d..14e1743 100644
--- a/src/tests/test_messages.py
+++ b/src/tests/test_messages.py
@@ -222,50 +222,6 @@ class TestCleanupOld:
         conn.close()
 
 
-class TestSetFlagsBulkReturnValue:
-    """Tests for the newly-flagged count returned by set_flags_bulk()."""
-
-    def test_counts_new_rows(self, tmp_path: pytest.TempPathFactory) -> None:
-        conn = messages.get_db()
-        entries: List[Dict[str, Optional[str]]] = [
-            {'msgid': 'n1@example.com', 'msg_date': None},
-            {'msgid': 'n2@example.com', 'msg_date': None},
-        ]
-        assert messages.set_flags_bulk(conn, entries, 'Seen') == 2
-        conn.close()
-
-    def test_repeat_is_zero(self, tmp_path: pytest.TempPathFactory) -> None:
-        conn = messages.get_db()
-        entries: List[Dict[str, Optional[str]]] = [
-            {'msgid': 'r1@example.com', 'msg_date': None},
-        ]
-        messages.set_flags_bulk(conn, entries, 'Seen')
-        assert messages.set_flags_bulk(conn, entries, 'Seen') == 0
-        conn.close()
-
-    def test_mixed_new_and_existing(self, tmp_path: pytest.TempPathFactory) -> None:
-        conn = messages.get_db()
-        first: List[Dict[str, Optional[str]]] = [
-            {'msgid': 'm1@example.com', 'msg_date': None},
-        ]
-        messages.set_flags_bulk(conn, first, 'Seen')
-        both: List[Dict[str, Optional[str]]] = [
-            {'msgid': 'm1@example.com', 'msg_date': None},
-            {'msgid': 'm2@example.com', 'msg_date': None},
-        ]
-        assert messages.set_flags_bulk(conn, both, 'Seen') == 1
-        conn.close()
-
-    def test_new_flag_on_existing_row(self, tmp_path: pytest.TempPathFactory) -> None:
-        conn = messages.get_db()
-        entries: List[Dict[str, Optional[str]]] = [
-            {'msgid': 'f1@example.com', 'msg_date': None},
-        ]
-        messages.set_flags_bulk(conn, entries, 'Seen')
-        assert messages.set_flags_bulk(conn, entries, 'Answered') == 1
-        conn.close()
-
-
 class TestMarkOutgoingSeen:
     """Tests for mark_outgoing_seen()."""
 

-- 
2.53.0