status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Fixes: #4206] Don't remove filters if not needed 

Filters were removed and recreated which resulted in a flaky test.
This was not needed as the filters didn't change, and they won't be
recreated if we reinstall the same filter.
This commit is contained in:
Andrea Maria Piana 2023-11-01 12:01:51 +00:00
parent eb437e9d8d
commit fd76367be7
No known key found for this signature in database
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/communities_events_utils_test.go
View File

@ -1368,7 +1368,9 @@ func testRejectMemberRequestToJoin(base CommunityEventsTestsInterface, community
response, err = WaitOnMessengerResponse( response, err = WaitOnMessengerResponse(
base.GetControlNode(), base.GetControlNode(),
func(r *MessengerResponse) bool { func(r *MessengerResponse) bool {
return len(r.Communities()) > 0 && !r.Communities()[0].HasMember(&user.identity.PublicKey) requests, err := base.GetControlNode().DeclinedRequestsToJoinForCommunity(community.ID())
s.Require().NoError(err)
return len(response.Communities()) == 1 && len(requests) == 1
}, },
"control node did not receive community request to join update from event sender", "control node did not receive community request to join update from event sender",
) )

8
protocol/messenger_communities.go
View File

@ -2110,13 +2110,7 @@ func (m *Messenger) UpdateCommunityFilters(community *communities.Community, pri
publicFiltersToInit := make([]transport.FiltersToInitialize, 0, len(community.DefaultFilters())+len(community.Chats())) publicFiltersToInit := make([]transport.FiltersToInitialize, 0, len(community.DefaultFilters())+len(community.Chats()))
for _, df := range community.DefaultFilters() { publicFiltersToInit = append(publicFiltersToInit, community.DefaultFilters()...)
_, err := m.transport.RemoveFilterByChatID(df.ChatID)
if err != nil {
return err
}
publicFiltersToInit = append(publicFiltersToInit, df)
}
for chatID := range community.Chats() { for chatID := range community.Chats() {
communityChatID := community.IDString() + chatID communityChatID := community.IDString() + chatID