From 5a23287cf53b92b1b2d69916b3d410307a8daba3 Mon Sep 17 00:00:00 2001 From: Evy Kassirer Date: Fri, 27 Jun 2025 13:13:13 -0700 Subject: [PATCH] peer_data: Stop returning unused boolean from remove_subscriber. --- web/src/peer_data.ts | 6 ++---- web/tests/peer_data.test.cjs | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/web/src/peer_data.ts b/web/src/peer_data.ts index a130bd44d7..22dd305d42 100644 --- a/web/src/peer_data.ts +++ b/web/src/peer_data.ts @@ -254,16 +254,14 @@ export function add_subscriber(stream_id: number, user_id: number): void { subscribers.add(user_id); } -export function remove_subscriber(stream_id: number, user_id: number): boolean { +export function remove_subscriber(stream_id: number, user_id: number): void { const subscribers = get_loaded_subscriber_subset(stream_id); if (!subscribers.has(user_id)) { blueslip.warn(`We tried to remove invalid subscriber: ${user_id}`); - return false; + return; } subscribers.delete(user_id); - - return true; } export function bulk_add_subscribers({ diff --git a/web/tests/peer_data.test.cjs b/web/tests/peer_data.test.cjs index 19bb74b9b1..24bfb47d68 100644 --- a/web/tests/peer_data.test.cjs +++ b/web/tests/peer_data.test.cjs @@ -184,8 +184,7 @@ test("subscribers", async () => { assert.equal(peer_data.get_subscriber_count(stream_id), 1); // remove - let ok = peer_data.remove_subscriber(stream_id, brutus.user_id); - assert.ok(ok); + peer_data.remove_subscriber(stream_id, brutus.user_id); assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id)); assert.equal(peer_data.get_subscriber_count(stream_id), 0); @@ -196,14 +195,12 @@ test("subscribers", async () => { "We called get_loaded_subscriber_subset for an untracked stream: " + bad_stream_id, ); blueslip.expect("warn", "We tried to remove invalid subscriber: 104"); - ok = peer_data.remove_subscriber(bad_stream_id, brutus.user_id); - assert.ok(!ok); + peer_data.remove_subscriber(bad_stream_id, brutus.user_id); blueslip.reset(); // verify that removing an already-removed subscriber is a noop blueslip.expect("warn", "We tried to remove invalid subscriber: 104"); - ok = peer_data.remove_subscriber(stream_id, brutus.user_id); - assert.ok(!ok); + peer_data.remove_subscriber(stream_id, brutus.user_id); assert.ok(!stream_data.is_user_subscribed(stream_id, brutus.user_id)); assert.equal(peer_data.get_subscriber_count(stream_id), 0); blueslip.reset();