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: prevent messenger being started twice 

Previously, Messenger was `Start`ed multiple times, which resulted in
the shutdown process not being invoked on previously initialized
Messenger's sub-instances. This led to the failure of MVDS instance
shutdown causing massive error logs due to the attempts to read from a
closed database.
This commit is contained in:
Patryk Osmaczko 2024-02-26 10:12:37 +01:00 committed by osmaczko
parent bafb0a71d0
commit 0a1a66afa7
27 changed files with 89 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
protocol/communities_messenger_test.go
View File

@ -3591,9 +3591,6 @@ func (s *MessengerCommunitiesSuite) TestStartCommunityRekeyLoop() {
func (s *MessengerCommunitiesSuite) TestCommunityRekeyAfterBan() {
s.owner.communitiesManager.RekeyInterval = 500 * time.Minute
_, err := s.owner.Start()
s.Require().NoError(err)
// Create a new community
response, err := s.owner.CreateCommunity(
&requests.CreateCommunity{
@ -3698,9 +3695,6 @@ func (s *MessengerCommunitiesSuite) TestCommunityRekeyAfterBanDisableCompatibili
common.RekeyCompatibility = false
s.owner.communitiesManager.RekeyInterval = 500 * time.Minute
_, err := s.owner.Start()
s.Require().NoError(err)
// Create a new community
response, err := s.owner.CreateCommunity(
&requests.CreateCommunity{

15
protocol/messenger.go
View File

@ -144,6 +144,7 @@ type Messenger struct {
browserDatabase *browsers.Database
httpServer *server.MediaServer
started bool
quit chan struct{}
ctx context.Context
cancel context.CancelFunc
@ -746,6 +747,11 @@ func (m *Messenger) ToBackground() {
}
func (m *Messenger) Start() (*MessengerResponse, error) {
if m.started {
return nil, errors.New("messenger already started")
}
m.started = true
now := time.Now().UnixMilli()
if err := m.settings.CheckAndDeleteExpiredKeypairsAndAccounts(uint64(now)); err != nil {
return nil, err
@ -1936,6 +1942,15 @@ func (m *Messenger) Shutdown() (err error) {
if m == nil {
return nil
}
select {
case _, ok := <-m.quit:
if !ok {
return errors.New("messenger already shutdown")
}
default:
}
close(m.quit)
m.cancel()
m.shutdownWaitGroup.Wait()

23
protocol/messenger_activity_center_test.go
View File

@ -36,12 +36,10 @@ type MessengerActivityCenterMessageSuite struct {
func (s *MessengerActivityCenterMessageSuite) TestDeleteOneToOneChat() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
r := &requests.SendContactRequest{
@ -92,8 +90,6 @@ func (s *MessengerActivityCenterMessageSuite) TestDeleteOneToOneChat() {
func (s *MessengerActivityCenterMessageSuite) TestEveryoneMentionTag() {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
// Create a community
@ -134,8 +130,6 @@ func (s *MessengerActivityCenterMessageSuite) TestEveryoneMentionTag() {
func (s *MessengerActivityCenterMessageSuite) TestReplyWithImage() {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
// create an http server
@ -218,8 +212,7 @@ func (s *MessengerActivityCenterMessageSuite) TestReplyWithImage() {
func (s *MessengerActivityCenterMessageSuite) TestMuteCommunityActivityCenterNotifications() {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
// Create a community
community, chat := s.createCommunity(bob)
@ -269,9 +262,7 @@ func (s *MessengerActivityCenterMessageSuite) TestMuteCommunityActivityCenterNot
func (s *MessengerActivityCenterMessageSuite) TestReadCommunityOverviewNotifications() {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer bob.Shutdown() // nolint: errcheck
defer TearDownMessenger(&s.Suite, bob)
// Create a community
community, chat := s.createCommunity(bob)
@ -283,7 +274,7 @@ func (s *MessengerActivityCenterMessageSuite) TestReadCommunityOverviewNotificat
s.joinCommunity(community, bob, alice)
// Mark community overview notification read
err = alice.DismissActivityCenterNotificationsByCommunity(context.Background(), &requests.DismissCommunityNotifications{CommunityID: community.ID()})
err := alice.DismissActivityCenterNotificationsByCommunity(context.Background(), &requests.DismissCommunityNotifications{CommunityID: community.ID()})
s.Require().NoError(err)
response, err := alice.GetActivityCenterState()
@ -294,8 +285,6 @@ func (s *MessengerActivityCenterMessageSuite) TestReadCommunityOverviewNotificat
func (s *MessengerActivityCenterMessageSuite) prepareCommunityChannelWithMentionAndReply() (*Messenger, *Messenger, *common.Message, *common.Message, *communities.Community) {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
// Create a community
@ -470,9 +459,7 @@ func (s *MessengerActivityCenterMessageSuite) TestMarkAllActivityCenterNotificat
func (s *MessengerActivityCenterMessageSuite) TestAliceDoesNotReceiveCommunityNotificationsBeforeJoined() {
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer bob.Shutdown() // nolint: errcheck
defer TearDownMessenger(&s.Suite, bob)
// Create a community
community, chat := s.createCommunity(bob)

32
protocol/messenger_backup_test.go
View File

@ -29,19 +29,11 @@ type MessengerBackupSuite struct {
MessengerBaseTestSuite
}
func (s *MessengerBackupSuite) SetupTest() {
s.MessengerBaseTestSuite.SetupTest()
_, err := s.m.Start()
s.Require().NoError(err)
}
func (s *MessengerBackupSuite) TestBackupContacts() {
bob1 := s.m
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Create 2 contacts
@ -166,8 +158,6 @@ func (s *MessengerBackupSuite) TestBackupProfile() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Check bob1
@ -320,8 +310,6 @@ func (s *MessengerBackupSuite) TestBackupSettings() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Check bob1
@ -440,8 +428,6 @@ func (s *MessengerBackupSuite) TestBackupContactsGreaterThanBatch() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Create contacts
@ -483,8 +469,6 @@ func (s *MessengerBackupSuite) TestBackupRemovedContact() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Create 2 contacts on bob 1
@ -558,8 +542,6 @@ func (s *MessengerBackupSuite) TestBackupLocalNickname() {
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
nickname := "don van vliet"
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Set contact nickname
@ -609,8 +591,6 @@ func (s *MessengerBackupSuite) TestBackupBlockedContacts() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Create contact
@ -666,8 +646,6 @@ func (s *MessengerBackupSuite) TestBackupCommunities() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Create a communitie
@ -739,8 +717,6 @@ func (s *MessengerBackupSuite) TestBackupKeypairs() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Backup
@ -813,8 +789,6 @@ func (s *MessengerBackupSuite) TestBackupKeycards() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Backup
@ -858,8 +832,6 @@ func (s *MessengerBackupSuite) TestBackupWatchOnlyAccounts() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Backup
@ -901,8 +873,6 @@ func (s *MessengerBackupSuite) TestBackupChats() {
s.NoError(err)
alice := s.newMessenger()
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
ourOneOneChat := CreateOneToOneChat("Our 1TO1", &alice.identity.PublicKey, alice.transport)
@ -912,8 +882,6 @@ func (s *MessengerBackupSuite) TestBackupChats() {
// Create bob2
bob2, err := newMessengerWithKey(s.shh, bob1.identity, s.logger, nil)
s.Require().NoError(err)
_, err = bob2.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob2)
// Backup

2
protocol/messenger_contact_requests_test.go
View File

@ -1225,8 +1225,6 @@ func (s *MessengerContactRequestSuite) TestBobSendsContactRequestAfterDecliningO
alice := s.m
bob := s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
bobID := types.EncodeHex(crypto.FromECDSAPub(&bob.identity.PublicKey))

14
protocol/messenger_contact_update_test.go
View File

@ -21,24 +21,16 @@ type MessengerContactUpdateSuite struct {
MessengerBaseTestSuite
}
func (s *MessengerContactUpdateSuite) SetupTest() {
s.MessengerBaseTestSuite.SetupTest()
_, err := s.m.Start()
s.Require().NoError(err)
}
func (s *MessengerContactUpdateSuite) TestReceiveContactUpdate() {
theirName := "ens-name.stateofus.eth"
contactID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
// Set ENS name
err = theirMessenger.settings.SaveSettingField(settings.PreferredName, theirName)
err := theirMessenger.settings.SaveSettingField(settings.PreferredName, theirName)
s.Require().NoError(err)
theirContactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
@ -111,8 +103,6 @@ func (s *MessengerContactUpdateSuite) TestAddContact() {
contactID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
response, err := theirMessenger.AddContact(context.Background(), &requests.AddContact{ID: contactID})
@ -150,8 +140,6 @@ func (s *MessengerContactUpdateSuite) TestAddContactWithENS() {
ensName := "blah.stateofus.eth"
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.Require().NoError(theirMessenger.ENSVerified(contactID, ensName))

17
protocol/messenger_contact_verification_test.go
View File

@ -22,13 +22,6 @@ type MessengerVerificationRequests struct {
MessengerBaseTestSuite
}
func (s *MessengerVerificationRequests) SetupTest() {
s.MessengerBaseTestSuite.SetupTest()
// We start the messenger in order to receive installations
_, err := s.m.Start()
s.Require().NoError(err)
}
func (s *MessengerVerificationRequests) mutualContact(theirMessenger *Messenger) {
messageText := "hello!"
@ -138,8 +131,6 @@ func (s *MessengerVerificationRequests) mutualContact(theirMessenger *Messenger)
func (s *MessengerVerificationRequests) TestAcceptVerificationRequests() {
theirMessenger := s.newMessenger(s.shh)
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)
@ -268,8 +259,6 @@ func (s *MessengerVerificationRequests) TestAcceptVerificationRequests() {
func (s *MessengerVerificationRequests) TestTrustedVerificationRequests() {
theirMessenger := s.newMessenger(s.shh)
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)
@ -381,8 +370,6 @@ func (s *MessengerVerificationRequests) TestTrustedVerificationRequests() {
func (s *MessengerVerificationRequests) TestUnthrustworthyVerificationRequests() {
theirMessenger := s.newMessenger(s.shh)
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)
@ -509,8 +496,6 @@ func (s *MessengerVerificationRequests) TestUnthrustworthyVerificationRequests()
func (s *MessengerVerificationRequests) TestDeclineVerificationRequests() {
theirMessenger := s.newMessenger(s.shh)
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)
@ -625,8 +610,6 @@ func (s *MessengerVerificationRequests) TestDeclineVerificationRequests() {
func (s *MessengerVerificationRequests) TestCancelVerificationRequest() {
theirMessenger := s.newMessenger(s.shh)
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)

6
protocol/messenger_delete_message_for_everyone_test.go
View File

@ -43,12 +43,6 @@ func (s *MessengerDeleteMessageForEveryoneSuite) SetupTest() {
s.admin = s.newMessenger()
s.bob = s.newMessenger()
s.moderator = s.newMessenger()
_, err := s.admin.Start()
s.Require().NoError(err)
_, err = s.bob.Start()
s.Require().NoError(err)
_, err = s.moderator.Start()
s.Require().NoError(err)
}
func (s *MessengerDeleteMessageForEveryoneSuite) TearDownTest() {

10
protocol/messenger_delete_message_for_me_test.go
View File

@ -68,10 +68,6 @@ func (s *MessengerDeleteMessageForMeSuite) SetupTest() {
s.alice1 = s.newMessenger()
s.alice2 = s.newMessenger()
_, err := s.alice1.Start()
s.Require().NoError(err)
_, err = s.alice2.Start()
s.Require().NoError(err)
}
func (s *MessengerDeleteMessageForMeSuite) TearDownTest() {
@ -218,17 +214,13 @@ func (s *MessengerDeleteMessageForMeSuite) TestDeleteMessageForMe() {
func (s *MessengerDeleteMessageForMeSuite) TestDeleteImageMessageFromReceiverSide() {
alice := s.otherNewMessenger()
_, err := alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
bob := s.otherNewMessenger()
_, err = bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, alice.transport)
err = alice.SaveChat(theirChat)
err := alice.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &alice.identity.PublicKey, alice.transport)

40
protocol/messenger_delete_message_test.go
View File

@ -21,12 +21,10 @@ type MessengerDeleteMessageSuite struct {
func (s *MessengerDeleteMessageSuite) TestDeleteMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -72,12 +70,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessage() {
func (s *MessengerDeleteMessageSuite) TestDeleteMessagePreviousLastMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -123,12 +119,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessagePreviousLastMessage() {
func (s *MessengerDeleteMessageSuite) TestDeleteWrongMessageType() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -152,12 +146,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteWrongMessageType() {
func (s *MessengerDeleteMessageSuite) TestDeleteMessageFirstThenMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
contact, err := BuildContactFromPublicKey(&theirMessenger.identity.PublicKey)
@ -207,12 +199,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessageFirstThenMessage() {
func (s *MessengerDeleteMessageSuite) TestDeleteImageMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -283,12 +273,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteImageMessage() {
func (s *MessengerDeleteMessageSuite) TestDeleteImageMessageFirstThenMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
contact, err := BuildContactFromPublicKey(&theirMessenger.identity.PublicKey)
@ -363,12 +351,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteImageMessageFirstThenMessage() {
func (s *MessengerDeleteMessageSuite) TestDeleteMessageWithAMention() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -425,12 +411,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessageWithAMention() {
// as read but the message still unseen (Seen == false)
func (s *MessengerDeleteMessageSuite) TestDeleteMessageAndChatIsAlreadyRead() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -486,12 +470,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessageAndChatIsAlreadyRead() {
func (s *MessengerDeleteMessageSuite) TestDeleteMessageReplyToImage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -541,12 +523,10 @@ func (s *MessengerDeleteMessageSuite) TestDeleteMessageReplyToImage() {
func (s *MessengerDeleteMessageSuite) TestDeleteMessageForMeReplyToImage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)

22
protocol/messenger_edit_message_test.go
View File

@ -23,12 +23,10 @@ type MessengerEditMessageSuite struct {
func (s *MessengerEditMessageSuite) TestEditMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -94,12 +92,10 @@ func (s *MessengerEditMessageSuite) TestEditMessage() {
func (s *MessengerEditMessageSuite) TestEditMessageEdgeCases() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -197,12 +193,10 @@ func (s *MessengerEditMessageSuite) TestEditMessageEdgeCases() {
func (s *MessengerEditMessageSuite) TestEditMessageFirstEditsThenMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
contact, err := BuildContactFromPublicKey(&theirMessenger.identity.PublicKey)
@ -256,8 +250,6 @@ func (s *MessengerEditMessageSuite) TestEditMessageFirstEditsThenMessage() {
// Test editing a message on an existing private group chat
func (s *MessengerEditMessageSuite) TestEditGroupChatMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
response, err := s.m.CreateGroupChatWithMembers(context.Background(), "id", []string{})
@ -341,12 +333,10 @@ func (s *MessengerEditMessageSuite) TestEditGroupChatMessage() {
func (s *MessengerEditMessageSuite) TestEditMessageWithMention() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -448,12 +438,10 @@ func (s *MessengerEditMessageSuite) TestEditMessageWithMention() {
func (s *MessengerEditMessageSuite) TestEditMessageWithLinkPreviews() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)

2
protocol/messenger_emoji_test.go
View File

@ -110,8 +110,6 @@ func (s *MessengerEmojiSuite) TestSendEmoji() {
func (s *MessengerEmojiSuite) TestEmojiPrivateGroup() {
bob := s.m
alice := s.newMessenger()
_, err := alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
response, err := bob.CreateGroupChatWithMembers(context.Background(), "test", []string{})
s.NoError(err)

45
protocol/messenger_group_chat_test.go
View File

@ -23,15 +23,6 @@ type MessengerGroupChatSuite struct {
MessengerBaseTestSuite
}
func (s *MessengerGroupChatSuite) startNewMessenger() *Messenger {
messenger := s.newMessenger()
_, err := messenger.Start()
s.Require().NoError(err)
return messenger
}
func (s *MessengerGroupChatSuite) createGroupChat(creator *Messenger, name string, members []string) *Chat {
response, err := creator.CreateGroupChatWithMembers(context.Background(), name, members)
s.Require().NoError(err)
@ -121,8 +112,8 @@ func (s *MessengerGroupChatSuite) TestGroupChatCreation() {
}
for i, testCase := range testCases {
creator := s.startNewMessenger()
member := s.startNewMessenger()
creator := s.newMessenger()
member := s.newMessenger()
members := []string{common.PubkeyToHex(&member.identity.PublicKey)}
if testCase.creatorAddedMemberAsContact {
@ -184,9 +175,9 @@ func (s *MessengerGroupChatSuite) TestGroupChatMembersAddition() {
}
for i, testCase := range testCases {
admin := s.startNewMessenger()
inviter := s.startNewMessenger()
member := s.startNewMessenger()
admin := s.newMessenger()
inviter := s.newMessenger()
member := s.newMessenger()
members := []string{common.PubkeyToHex(&member.identity.PublicKey)}
if testCase.inviterAddedMemberAsContact {
@ -223,10 +214,10 @@ func (s *MessengerGroupChatSuite) TestGroupChatMembersAddition() {
}
func (s *MessengerGroupChatSuite) TestGroupChatMembersRemoval() {
admin := s.startNewMessenger()
memberA := s.startNewMessenger()
memberB := s.startNewMessenger()
memberC := s.startNewMessenger()
admin := s.newMessenger()
memberA := s.newMessenger()
memberB := s.newMessenger()
memberC := s.newMessenger()
members := []string{common.PubkeyToHex(&memberA.identity.PublicKey), common.PubkeyToHex(&memberB.identity.PublicKey),
common.PubkeyToHex(&memberC.identity.PublicKey)}
@ -266,8 +257,8 @@ func (s *MessengerGroupChatSuite) TestGroupChatMembersRemoval() {
}
func (s *MessengerGroupChatSuite) TestGroupChatEdit() {
admin := s.startNewMessenger()
member := s.startNewMessenger()
admin := s.newMessenger()
member := s.newMessenger()
s.makeMutualContacts(admin, member)
groupChat := s.createGroupChat(admin, "test_group_chat", []string{common.PubkeyToHex(&member.identity.PublicKey)})
@ -327,8 +318,8 @@ func (s *MessengerGroupChatSuite) TestGroupChatEdit() {
}
func (s *MessengerGroupChatSuite) TestGroupChatDeleteMemberMessage() {
admin := s.startNewMessenger()
member := s.startNewMessenger()
admin := s.newMessenger()
member := s.newMessenger()
s.makeMutualContacts(admin, member)
groupChat := s.createGroupChat(admin, "test_group_chat", []string{common.PubkeyToHex(&member.identity.PublicKey)})
@ -366,8 +357,8 @@ func (s *MessengerGroupChatSuite) TestGroupChatDeleteMemberMessage() {
}
func (s *MessengerGroupChatSuite) TestGroupChatHandleDeleteMemberMessage() {
admin := s.startNewMessenger()
member := s.startNewMessenger()
admin := s.newMessenger()
member := s.newMessenger()
s.makeMutualContacts(admin, member)
groupChat := s.createGroupChat(admin, "test_group_chat", []string{common.PubkeyToHex(&member.identity.PublicKey)})
@ -413,8 +404,8 @@ func (s *MessengerGroupChatSuite) TestGroupChatHandleDeleteMemberMessage() {
}
func (s *MessengerGroupChatSuite) TestGroupChatMembersRemovalOutOfOrder() {
admin := s.startNewMessenger()
memberA := s.startNewMessenger()
admin := s.newMessenger()
memberA := s.newMessenger()
members := []string{common.PubkeyToHex(&memberA.identity.PublicKey)}
s.makeMutualContacts(admin, memberA)
@ -457,7 +448,7 @@ func (s *MessengerGroupChatSuite) TestGroupChatMembersRemovalOutOfOrder() {
}
func (s *MessengerGroupChatSuite) TestGroupChatMembersInfoSync() {
admin, memberA, memberB := s.startNewMessenger(), s.startNewMessenger(), s.startNewMessenger()
admin, memberA, memberB := s.newMessenger(), s.newMessenger(), s.newMessenger()
s.Require().NoError(admin.settings.SaveSettingField(settings.DisplayName, "admin"))
s.Require().NoError(memberA.settings.SaveSettingField(settings.DisplayName, "memberA"))
s.Require().NoError(memberB.settings.SaveSettingField(settings.DisplayName, "memberB"))

2
protocol/messenger_installations_test.go
View File

@ -211,8 +211,6 @@ func (s *MessengerInstallationSuite) TestSyncInstallation() {
// Create Alice for the 1-1 chat
alice := s.newMessenger()
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
// Create 1-1 chat

5
protocol/messenger_messages_tracking_test.go
View File

@ -98,11 +98,6 @@ func (s *MessengerMessagesTrackingSuite) SetupTest() {
s.aliceWaku = wakuNodes[1]
s.alice, s.aliceInterceptor = s.newMessenger(s.aliceWaku, s.logger.With(zap.String("name", "alice")))
_, err := s.bob.Start()
s.Require().NoError(err)
_, err = s.alice.Start()
s.Require().NoError(err)
}
func (s *MessengerMessagesTrackingSuite) TearDownTest() {

8
protocol/messenger_pin_message_test.go
View File

@ -20,12 +20,10 @@ type MessengerPinMessageSuite struct {
func (s *MessengerPinMessageSuite) TestPinMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -91,12 +89,10 @@ func (s *MessengerPinMessageSuite) TestPinMessage() {
func (s *MessengerPinMessageSuite) TestPinMessageOutOfOrder() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)

15
protocol/messenger_profile_showcase_test.go
View File

@ -107,9 +107,6 @@ func (s *TestMessengerProfileShowcase) newMessengerForProfileShowcase() *Messeng
m, err := newMessengerWithKey(s.shh, privateKey, s.logger, options)
s.Require().NoError(err)
_, err = m.Start()
s.Require().NoError(err)
return m
}
@ -300,8 +297,6 @@ func (s *TestMessengerProfileShowcase) TestFailToSaveProfileShowcasePreferencesW
func (s *TestMessengerProfileShowcase) TestEncryptAndDecryptProfileShowcaseEntries() {
// Add mutual contact
theirMessenger := s.newMessengerForProfileShowcase()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
s.mutualContact(theirMessenger)
@ -433,6 +428,8 @@ func (s *TestMessengerProfileShowcase) TestEncryptAndDecryptProfileShowcaseEntri
}
func (s *TestMessengerProfileShowcase) TestShareShowcasePreferences() {
s.T().Skip("flaky test")
// Set Display name to pass shouldPublishChatIdentity check
profileKp := accounts.GetProfileKeypairForTest(true, false, false)
profileKp.KeyUID = s.m.account.KeyUID
@ -446,16 +443,12 @@ func (s *TestMessengerProfileShowcase) TestShareShowcasePreferences() {
// Add mutual contact
mutualContact := s.newMessengerForProfileShowcase()
_, err = mutualContact.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, mutualContact)
s.mutualContact(mutualContact)
// Add identity verified contact
verifiedContact := s.newMessengerForProfileShowcase()
_, err = verifiedContact.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, verifiedContact)
s.mutualContact(verifiedContact)
@ -610,8 +603,6 @@ func (s *TestMessengerProfileShowcase) TestProfileShowcaseProofOfMembershipUnenc
// Add bob as a mutual contact
bob := s.newMessengerForProfileShowcase()
_, err = bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
s.mutualContact(bob)
@ -677,8 +668,6 @@ func (s *TestMessengerProfileShowcase) TestProfileShowcaseProofOfMembershipEncry
// Add bob as a mutual contact
bob := s.newMessengerForProfileShowcase()
_, err = bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
s.mutualContact(bob)

20
protocol/messenger_send_images_album_test.go
View File

@ -32,12 +32,10 @@ func (s *MessengerSendImagesAlbumSuite) joinCommunity(community *communities.Com
func (s *MessengerSendImagesAlbumSuite) TestAlbumImageMessagesSend() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -93,12 +91,10 @@ func (s *MessengerSendImagesAlbumSuite) TestAlbumImageMessagesSend() {
func (s *MessengerSendImagesAlbumSuite) TestAlbumImageMessagesWithMentionSend() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -146,8 +142,6 @@ func (s *MessengerSendImagesAlbumSuite) TestAlbumImageMessagesWithMentionSend()
// This test makes sure that if you get a mention with an image ina community, it sends it correctly and has a notif
func (s *MessengerSendImagesAlbumSuite) TestSingleImageMessageWithMentionInCommunitySend() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
community, chat := createCommunity(&s.Suite, s.m)
@ -167,7 +161,7 @@ func (s *MessengerSendImagesAlbumSuite) TestSingleImageMessageWithMentionInCommu
album = append(album, outgoingMessage)
}
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.NoError(err)
response, err := s.m.SendChatMessages(context.Background(), album)
s.NoError(err)
@ -197,11 +191,9 @@ func (s *MessengerSendImagesAlbumSuite) TestSingleImageMessageWithMentionInCommu
func (s *MessengerSendImagesAlbumSuite) TestAlbumImageEditText() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)
@ -280,8 +272,6 @@ func (s *MessengerSendImagesAlbumSuite) TestAlbumImageEditText() {
// This test makes sure that if you get a mention with an album of images in a community, it sends it correctly and has correct AC notif with album
func (s *MessengerSendImagesAlbumSuite) TestAlbumImagesMessageWithMentionInCommunitySend() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
community, chat := createCommunity(&s.Suite, s.m)
@ -301,7 +291,7 @@ func (s *MessengerSendImagesAlbumSuite) TestAlbumImagesMessageWithMentionInCommu
album = append(album, outgoingMessage)
}
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.NoError(err)
response, err := s.m.SendChatMessages(context.Background(), album)
s.NoError(err)

4
protocol/messenger_share_image_test.go
View File

@ -55,12 +55,10 @@ func buildImageMessage(s *MessengerShareMessageSuite, chat Chat) *common.Message
func (s *MessengerShareMessageSuite) TestImageMessageSharing() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("Their 1TO1", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("Our 1TO1", &theirMessenger.identity.PublicKey, s.m.transport)

2
protocol/messenger_share_urls_test.go
View File

@ -52,8 +52,6 @@ func (s *MessengerShareUrlsSuite) createCommunity() *communities.Community {
func (s *MessengerShareUrlsSuite) createContact() (*Messenger, *Contact) {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
ensName := "blah.stateofus.eth"

4
protocol/messenger_sync_chat_test.go
View File

@ -68,10 +68,6 @@ func (s *MessengerSyncChatSuite) SetupTest() {
s.alice1 = s.newMessenger()
s.alice2 = s.newMessenger()
_, err := s.alice1.Start()
s.Require().NoError(err)
_, err = s.alice2.Start()
s.Require().NoError(err)
}
func (s *MessengerSyncChatSuite) TearDownTest() {

4
protocol/messenger_sync_keycard_change_test.go
View File

@ -45,10 +45,8 @@ func (s *MessengerSyncKeycardChangeSuite) SetupTest() {
s.main = s.newMessenger(s.shh)
s.privateKey = s.main.identity
// Start the main messenger in order to receive installations
_, err := s.main.Start()
s.Require().NoError(err)
var err error
// Create new device and add main account to
s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger, nil)
s.Require().NoError(err)

4
protocol/messenger_sync_keycards_state_test.go
View File

@ -45,10 +45,8 @@ func (s *MessengerSyncKeycardsStateSuite) SetupTest() {
s.main = s.newMessenger(s.shh)
s.privateKey = s.main.identity
// Start the main messenger in order to receive installations
_, err := s.main.Start()
s.Require().NoError(err)
var err error
// Create new device and add main account to
s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger, nil)
s.Require().NoError(err)

4
protocol/messenger_sync_saved_addresses_test.go
View File

@ -49,10 +49,8 @@ func (s *MessengerSyncSavedAddressesSuite) SetupTest() {
s.main = s.newMessenger(s.logger.Named("main"))
s.privateKey = s.main.identity
// Start the main messenger in order to receive installations
_, err := s.main.Start()
s.Require().NoError(err)
var err error
// Create new device and add main account to
s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger.Named("other"), nil)
s.Require().NoError(err)

72
protocol/messenger_test.go
View File

@ -513,11 +513,9 @@ func (s *MessengerSuite) TestRetrieveOwnPublic() {
// Retrieve their public message
func (s *MessengerSuite) TestRetrieveTheirPublic() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreatePublicChat("status", s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
chat := CreatePublicChat("status", s.m.transport)
@ -557,11 +555,9 @@ func (s *MessengerSuite) TestRetrieveTheirPublic() {
// Drop audio message in public group
func (s *MessengerSuite) TestDropAudioMessageInPublicGroup() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreatePublicChat("status", s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
chat := CreatePublicChat("status", s.m.transport)
@ -584,11 +580,9 @@ func (s *MessengerSuite) TestDropAudioMessageInPublicGroup() {
func (s *MessengerSuite) TestDeletedAtClockValue() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreatePublicChat("status", s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
chat := CreatePublicChat("status", s.m.transport)
@ -616,12 +610,10 @@ func (s *MessengerSuite) TestDeletedAtClockValue() {
func (s *MessengerSuite) TestRetrieveBlockedContact() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreatePublicChat("status", s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
_, err = theirMessenger.Join(theirChat)
s.Require().NoError(err)
@ -696,11 +688,9 @@ func (s *MessengerSuite) TestRetrieveBlockedContact() {
// Resend their public message, receive only once
func (s *MessengerSuite) TestResendPublicMessage() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreatePublicChat("status", s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
chat := CreatePublicChat("status", s.m.transport)
@ -752,11 +742,9 @@ func (s *MessengerSuite) TestResendPublicMessage() {
// Test receiving a message on an existing private chat
func (s *MessengerSuite) TestRetrieveTheirPrivateChatExisting() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirChat := CreateOneToOneChat("XXX", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(theirChat)
err := theirMessenger.SaveChat(theirChat)
s.Require().NoError(err)
ourChat := CreateOneToOneChat("our-chat", &theirMessenger.identity.PublicKey, s.m.transport)
@ -795,11 +783,9 @@ func (s *MessengerSuite) TestRetrieveTheirPrivateChatExisting() {
// Test receiving a message on an non-existing private chat
func (s *MessengerSuite) TestRetrieveTheirPrivateChatNonExisting() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
chat := CreateOneToOneChat("XXX", &s.privateKey.PublicKey, s.m.transport)
err = theirMessenger.SaveChat(chat)
err := theirMessenger.SaveChat(chat)
s.NoError(err)
inputMessage := buildTestMessage(*chat)
@ -834,11 +820,9 @@ func (s *MessengerSuite) TestRetrieveTheirPrivateChatNonExisting() {
// Test receiving a message on an non-existing public chat
func (s *MessengerSuite) TestRetrieveTheirPublicChatNonExisting() {
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
chat := CreatePublicChat("test-chat", s.m.transport)
err = theirMessenger.SaveChat(chat)
err := theirMessenger.SaveChat(chat)
s.NoError(err)
inputMessage := buildTestMessage(*chat)
@ -860,10 +844,8 @@ func (s *MessengerSuite) TestRetrieveTheirPublicChatNonExisting() {
func (s *MessengerSuite) TestRetrieveTheirPrivateGroupChat() {
var response *MessengerResponse
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
response, err = s.m.CreateGroupChatWithMembers(context.Background(), "id", []string{})
response, err := s.m.CreateGroupChatWithMembers(context.Background(), "id", []string{})
s.NoError(err)
s.Require().Len(response.Chats(), 1)
@ -929,10 +911,8 @@ func (s *MessengerSuite) TestRetrieveTheirPrivateGroupChat() {
func (s *MessengerSuite) TestChangeNameGroupChat() {
var response *MessengerResponse
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
response, err = s.m.CreateGroupChatWithMembers(context.Background(), "old-name", []string{})
response, err := s.m.CreateGroupChatWithMembers(context.Background(), "old-name", []string{})
s.NoError(err)
s.Require().Len(response.Chats(), 1)
@ -986,10 +966,8 @@ func (s *MessengerSuite) TestChangeNameGroupChat() {
func (s *MessengerSuite) TestReInvitedToGroupChat() {
var response *MessengerResponse
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
response, err = s.m.CreateGroupChatWithMembers(context.Background(), "old-name", []string{})
response, err := s.m.CreateGroupChatWithMembers(context.Background(), "old-name", []string{})
s.NoError(err)
s.Require().Len(response.Chats(), 1)
@ -1519,14 +1497,12 @@ func (s *MessengerSuite) TestDeclineRequestAddressForTransaction() {
value := testValue
contract := testContract
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
myPkString := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
myAddress := crypto.PubkeyToAddress(s.m.identity.PublicKey)
@ -1614,8 +1590,6 @@ func (s *MessengerSuite) TestSendEthTransaction() {
contract := testContract
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
@ -1623,7 +1597,7 @@ func (s *MessengerSuite) TestSendEthTransaction() {
receiverAddressString := strings.ToLower(receiverAddress.Hex())
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
transactionHash := testTransactionHash
@ -1718,8 +1692,6 @@ func (s *MessengerSuite) TestSendTokenTransaction() {
contract := testContract
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
@ -1727,7 +1699,7 @@ func (s *MessengerSuite) TestSendTokenTransaction() {
receiverAddressString := strings.ToLower(receiverAddress.Hex())
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
transactionHash := testTransactionHash
@ -1821,8 +1793,6 @@ func (s *MessengerSuite) TestAcceptRequestAddressForTransaction() {
value := testValue
contract := testContract
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
myPkString := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
@ -1830,7 +1800,7 @@ func (s *MessengerSuite) TestAcceptRequestAddressForTransaction() {
myAddress := crypto.PubkeyToAddress(s.m.identity.PublicKey)
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
response, err := s.m.RequestAddressForTransaction(context.Background(), theirPkString, myAddress.Hex(), value, contract)
@ -1919,13 +1889,11 @@ func (s *MessengerSuite) TestDeclineRequestTransaction() {
receiverAddress := crypto.PubkeyToAddress(s.m.identity.PublicKey)
receiverAddressString := strings.ToLower(receiverAddress.Hex())
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
response, err := s.m.RequestTransaction(context.Background(), theirPkString, value, contract, receiverAddressString)
@ -2009,13 +1977,11 @@ func (s *MessengerSuite) TestRequestTransaction() {
receiverAddress := crypto.PubkeyToAddress(s.m.identity.PublicKey)
receiverAddressString := strings.ToLower(receiverAddress.Hex())
theirMessenger := s.newMessenger()
_, err := theirMessenger.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, theirMessenger)
theirPkString := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
chat := CreateOneToOneChat(theirPkString, &theirMessenger.identity.PublicKey, s.m.transport)
err = s.m.SaveChat(chat)
err := s.m.SaveChat(chat)
s.Require().NoError(err)
response, err := s.m.RequestTransaction(context.Background(), theirPkString, value, contract, receiverAddressString)
@ -2521,8 +2487,6 @@ func (t *testTimeSource) GetCurrentTime() uint64 {
func (s *MessengerSuite) TestSendMessageMention() {
// Initialize Alice and Bob's messengers
alice, bob := s.m, s.newMessenger()
_, err := bob.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, bob)
// Set display names for Bob and Alice
@ -2541,7 +2505,7 @@ func (s *MessengerSuite) TestSendMessageMention() {
inputMessage.ChatId = chat.ID
inputMessage.Text = fmt.Sprintf("@%s talk to @%s", alice.myHexIdentity(), bob.myHexIdentity())
inputMessage.ContentType = protobuf.ChatMessage_TEXT_PLAIN
_, err = bob.SendChatMessage(context.Background(), inputMessage)
_, err := bob.SendChatMessage(context.Background(), inputMessage)
s.Require().NoError(err)
// Wait for Alice to receive the message and make sure it's properly formatted

23
protocol/push_notification_test.go
View File

@ -54,8 +54,6 @@ func (s *MessengerPushNotificationSuite) SetupTest() {
s.m = s.newMessenger(s.shh)
s.privateKey = s.m.identity
_, err := s.m.Start()
s.Require().NoError(err)
}
func (s *MessengerPushNotificationSuite) TearDownTest() {
@ -101,9 +99,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotification() {
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
bobInstallationIDs := []string{bob1.installationID, bob2.installationID}
@ -284,9 +279,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationFromContactO
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
bobInstallationIDs := []string{bob.installationID}
@ -428,14 +420,9 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationRetries() {
alice := s.newMessenger(s.shh)
// another contact to invalidate the token
frank := s.newMessenger(s.shh)
_, err = frank.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, frank)
// start alice and enable push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
bobInstallationIDs := []string{bob.installationID}
@ -655,8 +642,6 @@ func (s *MessengerPushNotificationSuite) TestContactCode() {
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
@ -716,8 +701,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationMention() {
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
@ -857,8 +840,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationCommunityReq
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())
@ -993,8 +974,6 @@ func (s *MessengerPushNotificationSuite) TestReceivePushNotificationPairedDevice
defer TearDownMessenger(&s.Suite, server)
alice := s.newMessenger(s.shh)
// start alice and enable sending push notifications
_, err = alice.Start()
s.Require().NoError(err)
defer TearDownMessenger(&s.Suite, alice)
s.Require().NoError(alice.EnableSendingPushNotifications())

2
server/pairing/sync_device_test.go
View File

@ -891,6 +891,8 @@ func (s *SyncDeviceSuite) TestTransferringKeystoreFiles() {
}
func (s *SyncDeviceSuite) TestTransferringKeystoreFilesAfterStopUisngKeycard() {
s.T().Skip("flaky test")
ctx := context.TODO()
// Prepare server