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

fix: use `messengerSignalsHandler` instead of global object

This commit is contained in:
Patryk Osmaczko 2023-10-20 16:25:13 +02:00 committed by osmaczko
parent 148721b680
commit eb232d4680
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
protocol/communities_messenger_signers_test.go
View File

@ -3,8 +3,6 @@ package protocol
import ( import (
"context" "context"
"crypto/ecdsa" "crypto/ecdsa"
"encoding/json"
"strings"
"testing" "testing"
"time" "time"
@ -22,7 +20,6 @@ import (
"github.com/status-im/status-go/protocol/tt" "github.com/status-im/status-go/protocol/tt"
"github.com/status-im/status-go/services/communitytokens" "github.com/status-im/status-go/services/communitytokens"
"github.com/status-im/status-go/services/wallet/bigint" "github.com/status-im/status-go/services/wallet/bigint"
"github.com/status-im/status-go/signal"
"github.com/status-im/status-go/transactions" "github.com/status-im/status-go/transactions"
"github.com/status-im/status-go/waku" "github.com/status-im/status-go/waku"
) )
@ -193,25 +190,11 @@ func (s *MessengerCommunitiesSignersSuite) TestControlNodeUpdateSigner() {
_, err = s.alice.SetCommunitySignerPubKey(context.Background(), community.ID(), chainID, communityAddress, transaction, "password", common.PubkeyToHex(&s.alice.identity.PublicKey)) _, err = s.alice.SetCommunitySignerPubKey(context.Background(), community.ID(), chainID, communityAddress, transaction, "password", common.PubkeyToHex(&s.alice.identity.PublicKey))
s.Require().NoError(err) s.Require().NoError(err)
var published bool
// We check the updated description is published as a signal
signal.SetMobileSignalHandler(func(data []byte) {
response := &MessengerResponse{}
err := json.Unmarshal(data, response)
if err != nil {
s.john.logger.Error("failed to unmarshal json", zap.Error(err))
return
}
published = strings.Contains(string(data), community.IDString())
})
// john accepts community update // john accepts community update
_, err = WaitOnMessengerResponse( _, err = WaitOnSignaledMessengerResponse(
s.john, s.john,
func(r *MessengerResponse) bool { func(r *MessengerResponse) bool {
return published return len(r.Communities()) > 0 && r.Communities()[0].IDString() == community.IDString()
}, },
"no communities", "no communities",
) )
@ -224,13 +207,11 @@ func (s *MessengerCommunitiesSignersSuite) TestControlNodeUpdateSigner() {
s.Require().True(common.IsPubKeyEqual(johnCommunity.ControlNode(), &s.alice.identity.PublicKey)) s.Require().True(common.IsPubKeyEqual(johnCommunity.ControlNode(), &s.alice.identity.PublicKey))
s.Require().False(johnCommunity.IsControlNode()) s.Require().False(johnCommunity.IsControlNode())
published = false
// We check the control node is correctly set on bob // We check the control node is correctly set on bob
_, err = WaitOnMessengerResponse( _, err = WaitOnSignaledMessengerResponse(
s.bob, s.bob,
func(r *MessengerResponse) bool { func(r *MessengerResponse) bool {
return published return len(r.Communities()) > 0 && r.Communities()[0].IDString() == community.IDString()
}, },
"no communities", "no communities",

5
protocol/messenger_communities.go
View File

@ -363,8 +363,9 @@ func (m *Messenger) handleCommunitiesSubscription(c chan *communities.Subscripti
m.logger.Error("failed to save data and prepare response") m.logger.Error("failed to save data and prepare response")
} }
signal.SendNewMessages(response) if m.config.messengerSignalsHandler != nil {
m.config.messengerSignalsHandler.MessengerResponse(response)
}
} }
case <-ticker.C: case <-ticker.C: