From 7da855c0bf030d19138e8f9c222eef5f4244b315 Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Thu, 13 Jul 2023 11:44:09 +0100
Subject: [PATCH] Use base test messenger suite

---
 protocol/messenger_browsers_test.go           | 10 ---
 protocol/messenger_contact_requests_test.go   | 61 +++++--------------
 protocol/messenger_contact_update_test.go     | 21 ++-----
 protocol/messenger_edit_message_test.go       | 31 ----------
 protocol/messenger_emoji_test.go              | 33 +---------
 protocol/messenger_group_chat_test.go         | 27 --------
 .../messenger_identity_display_name_test.go   | 34 -----------
 protocol/messenger_installations_test.go      | 34 +----------
 protocol/messenger_mute_test.go               | 32 ----------
 protocol/messenger_reply_test.go              | 32 ----------
 protocol/messenger_share_urls_test.go         | 31 ----------
 protocol/messenger_sync_clear_history_test.go | 35 -----------
 .../messenger_sync_profile_picture_test.go    | 35 -----------
 protocol/messenger_sync_wallets_test.go       | 35 -----------
 protocol/messenger_walletconnect_test.go      | 35 -----------
 protocol/push_notification_test.go            |  9 ++-
 16 files changed, 29 insertions(+), 466 deletions(-)

diff --git a/protocol/messenger_browsers_test.go b/protocol/messenger_browsers_test.go
index 083b9b126..330dc6abf 100644
--- a/protocol/messenger_browsers_test.go
+++ b/protocol/messenger_browsers_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/services/browsers"
 	"github.com/status-im/status-go/waku"
@@ -41,15 +40,6 @@ func (s *BrowserSuite) TearDownTest() {
 	s.Require().NoError(s.m.Shutdown())
 }
 
-func (s *BrowserSuite) newMessenger() *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerBackupSuite) TestBrowsersOrderedNewestFirst() {
 	msngr := s.newMessenger()
 	testBrowsers := []*browsers.Browser{
diff --git a/protocol/messenger_contact_requests_test.go b/protocol/messenger_contact_requests_test.go
index 9f1618076..24c1ff578 100644
--- a/protocol/messenger_contact_requests_test.go
+++ b/protocol/messenger_contact_requests_test.go
@@ -7,15 +7,12 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/multiaccounts/settings"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerContactRequestSuite(t *testing.T) {
@@ -26,34 +23,6 @@ type MessengerContactRequestSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerContactRequestSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerContactRequestSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerContactRequestSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerContactRequestSuite) findFirstByContentType(messages []*common.Message, contentType protobuf.ChatMessage_ContentType) *common.Message {
 	return FindFirstByContentType(messages, contentType)
 }
@@ -380,7 +349,7 @@ func (s *MessengerContactRequestSuite) syncInstallationContactV2FromContact(cont
 func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequest() { //nolint: unused
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -398,7 +367,7 @@ func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequest() { //
 func (s *MessengerContactRequestSuite) TestReceiveAndDismissContactRequest() {
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -416,7 +385,7 @@ func (s *MessengerContactRequestSuite) TestReceiveAndDismissContactRequest() {
 func (s *MessengerContactRequestSuite) TestReceiveAcceptAndRetractContactRequest() { //nolint: unused
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -437,7 +406,7 @@ func (s *MessengerContactRequestSuite) TestReceiveAcceptAndRetractContactRequest
 func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequestTwice() { //nolint: unused
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -494,7 +463,7 @@ func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequestTwice()
 func (s *MessengerContactRequestSuite) TestAcceptLatestContactRequestForContact() {
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -589,7 +558,7 @@ func (s *MessengerContactRequestSuite) TestAcceptLatestContactRequestForContact(
 func (s *MessengerContactRequestSuite) TestDismissLatestContactRequestForContact() {
 	messageText := "hello!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -635,7 +604,7 @@ func (s *MessengerContactRequestSuite) TestPairedDevicesRemoveContact() {
 	pairTwoDevices(&s.Suite, alice1, alice2)
 	pairTwoDevices(&s.Suite, alice2, alice1)
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err = bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -699,7 +668,7 @@ func (s *MessengerContactRequestSuite) TestAliceRecoverStateSendContactRequest()
 
 	alice1 := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -771,7 +740,7 @@ func (s *MessengerContactRequestSuite) TestAliceRecoverStateReceiveContactReques
 
 	alice1 := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -852,7 +821,7 @@ func (s *MessengerContactRequestSuite) TestAliceOfflineRetractsAndAddsCorrectOrd
 
 	alice1 := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -902,7 +871,7 @@ func (s *MessengerContactRequestSuite) TestAliceOfflineRetractsAndAddsWrongOrder
 
 	alice1 := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -954,7 +923,7 @@ func (s *MessengerContactRequestSuite) TestAliceOfflineRetractsAndAddsWrongOrder
 func (s *MessengerContactRequestSuite) TestAliceResendsContactRequestAfterRemovingBobFromContacts() {
 	messageTextFirst := "hello 1!"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -1010,7 +979,7 @@ func (s *MessengerContactRequestSuite) TestBobSendsContactRequestAfterDecliningO
 
 	alice := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
@@ -1193,7 +1162,7 @@ func (s *MessengerContactRequestSuite) TestBobRestoresIncomingContactRequestFrom
 
 	alice := s.m
 
-	bob1 := s.newMessenger(s.shh)
+	bob1 := s.newMessenger()
 	_, err := bob1.Start()
 	s.Require().NoError(err)
 	defer bob1.Shutdown() // nolint: errcheck
@@ -1273,7 +1242,7 @@ func (s *MessengerContactRequestSuite) TestAliceRestoresOutgoingContactRequestFr
 
 	alice1 := s.m
 
-	bob := s.newMessenger(s.shh)
+	bob := s.newMessenger()
 	_, err := bob.Start()
 	s.Require().NoError(err)
 	defer bob.Shutdown() // nolint: errcheck
diff --git a/protocol/messenger_contact_update_test.go b/protocol/messenger_contact_update_test.go
index baaedf6eb..9531a6fe4 100644
--- a/protocol/messenger_contact_update_test.go
+++ b/protocol/messenger_contact_update_test.go
@@ -32,31 +32,18 @@ func (s *MessengerContactUpdateSuite) SetupTest() {
 	s.shh = gethbridge.NewGethWakuWrapper(shh)
 	s.Require().NoError(shh.Start())
 
-	s.m = s.newMessenger(s.shh)
+	s.m = s.newMessenger()
 	s.privateKey = s.m.identity
 	_, err := s.m.Start()
 	s.Require().NoError(err)
 }
 
-func (s *MessengerContactUpdateSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerContactUpdateSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerContactUpdateSuite) TestReceiveContactUpdate() {
 	theirName := "ens-name.stateofus.eth"
 
 	contactID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -124,7 +111,7 @@ func (s *MessengerContactUpdateSuite) TestReceiveContactUpdate() {
 func (s *MessengerContactUpdateSuite) TestAddContact() {
 	contactID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
@@ -158,7 +145,7 @@ func (s *MessengerContactUpdateSuite) TestAddContactWithENS() {
 	contactID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
 	ensName := "blah.stateofus.eth"
 
-	theirMessenger := s.newMessenger(s.shh)
+	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
 	s.Require().NoError(err)
 	defer theirMessenger.Shutdown() // nolint: errcheck
diff --git a/protocol/messenger_edit_message_test.go b/protocol/messenger_edit_message_test.go
index cad7cab90..a7c1e9a00 100644
--- a/protocol/messenger_edit_message_test.go
+++ b/protocol/messenger_edit_message_test.go
@@ -6,14 +6,11 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerEditMessageSuite(t *testing.T) {
@@ -24,34 +21,6 @@ type MessengerEditMessageSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerEditMessageSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger()
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerEditMessageSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerEditMessageSuite) newMessenger() *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerEditMessageSuite) TestEditMessage() {
 	theirMessenger := s.newMessenger()
 	_, err := theirMessenger.Start()
diff --git a/protocol/messenger_emoji_test.go b/protocol/messenger_emoji_test.go
index 809560223..fc6b31765 100644
--- a/protocol/messenger_emoji_test.go
+++ b/protocol/messenger_emoji_test.go
@@ -8,14 +8,11 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/multiaccounts"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/protobuf"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerEmojiSuite(t *testing.T) {
@@ -26,34 +23,6 @@ type MessengerEmojiSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerEmojiSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerEmojiSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerEmojiSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerEmojiSuite) TestSendEmoji() {
 	alice := s.m
 	alice.account = &multiaccounts.Account{KeyUID: "0xdeadbeef"}
@@ -140,7 +109,7 @@ func (s *MessengerEmojiSuite) TestSendEmoji() {
 
 func (s *MessengerEmojiSuite) TestEmojiPrivateGroup() {
 	bob := s.m
-	alice := s.newMessenger(s.shh)
+	alice := s.newMessenger()
 	_, err := alice.Start()
 	s.Require().NoError(err)
 	defer alice.Shutdown() // nolint: errcheck
diff --git a/protocol/messenger_group_chat_test.go b/protocol/messenger_group_chat_test.go
index 55ab84592..bfb86b29c 100644
--- a/protocol/messenger_group_chat_test.go
+++ b/protocol/messenger_group_chat_test.go
@@ -8,13 +8,9 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	userimage "github.com/status-im/status-go/images"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/protobuf"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestGroupChatSuite(t *testing.T) {
@@ -25,16 +21,6 @@ type MessengerGroupChatSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerGroupChatSuite) newMessenger() *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, []Option{})
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 func (s *MessengerGroupChatSuite) startNewMessenger() *Messenger {
 	messenger := s.newMessenger()
 
@@ -44,19 +30,6 @@ func (s *MessengerGroupChatSuite) startNewMessenger() *Messenger {
 	return messenger
 }
 
-func (s *MessengerGroupChatSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-}
-
-func (s *MessengerGroupChatSuite) TearDownTest() {
-}
-
 func (s *MessengerGroupChatSuite) createGroupChat(creator *Messenger, name string, members []string) *Chat {
 	response, err := creator.CreateGroupChatWithMembers(context.Background(), name, members)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_identity_display_name_test.go b/protocol/messenger_identity_display_name_test.go
index 162b7ccbb..4a007e4a8 100644
--- a/protocol/messenger_identity_display_name_test.go
+++ b/protocol/messenger_identity_display_name_test.go
@@ -5,16 +5,11 @@ import (
 	"errors"
 	"testing"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 
 	"github.com/stretchr/testify/suite"
-
-	"github.com/status-im/status-go/eth-node/types"
 )
 
 const testDisplayName = "My New Display Name"
@@ -27,35 +22,6 @@ type MessengerProfileDisplayNameHandlerSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerProfileDisplayNameHandlerSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerProfileDisplayNameHandlerSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerProfileDisplayNameHandlerSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
 func (s *MessengerProfileDisplayNameHandlerSuite) TestDisplayNameChange() {
 	// check display name for the created instance
 	displayName, err := s.m.settings.DisplayName()
diff --git a/protocol/messenger_installations_test.go b/protocol/messenger_installations_test.go
index 41f16e3b5..cb9ca1872 100644
--- a/protocol/messenger_installations_test.go
+++ b/protocol/messenger_installations_test.go
@@ -9,13 +9,11 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 const statusChatID = "status"
@@ -29,36 +27,6 @@ type MessengerInstallationSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerInstallationSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerInstallationSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerInstallationSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 func (s *MessengerInstallationSuite) TestReceiveInstallation() {
 	theirMessenger, err := newMessengerWithKey(s.shh, s.privateKey, s.logger, nil)
 	s.Require().NoError(err)
@@ -297,7 +265,7 @@ func (s *MessengerInstallationSuite) TestSyncInstallationNewMessages() {
 	// pair
 	bob2, err := newMessengerWithKey(s.shh, s.privateKey, s.logger, nil)
 	s.Require().NoError(err)
-	alice := s.newMessenger(s.shh)
+	alice := s.newMessenger()
 
 	err = bob2.SetInstallationMetadata(bob2.installationID, &multidevice.InstallationMetadata{
 		Name:       "their-name",
diff --git a/protocol/messenger_mute_test.go b/protocol/messenger_mute_test.go
index cbbedcd73..f01a5af9a 100644
--- a/protocol/messenger_mute_test.go
+++ b/protocol/messenger_mute_test.go
@@ -7,12 +7,8 @@ import (
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
-	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/requests"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerMuteSuite(t *testing.T) {
@@ -23,34 +19,6 @@ type MessengerMuteSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerMuteSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerMuteSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerMuteSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerMuteSuite) TestSetMute() {
 	key, err := crypto.GenerateKey()
 	s.Require().NoError(err)
diff --git a/protocol/messenger_reply_test.go b/protocol/messenger_reply_test.go
index fbbfd5282..e2f028c75 100644
--- a/protocol/messenger_reply_test.go
+++ b/protocol/messenger_reply_test.go
@@ -6,12 +6,8 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
-	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/multiaccounts"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerReplySuite(t *testing.T) {
@@ -22,34 +18,6 @@ type MessengerReplySuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerReplySuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerReplySuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerReplySuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerReplySuite) TestReceiveReply() {
 	alice := s.m
 	alice.account = &multiaccounts.Account{KeyUID: "0xdeadbeef"}
diff --git a/protocol/messenger_share_urls_test.go b/protocol/messenger_share_urls_test.go
index aedfacbd6..1dd4ccf5e 100644
--- a/protocol/messenger_share_urls_test.go
+++ b/protocol/messenger_share_urls_test.go
@@ -8,16 +8,13 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/communities"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
-	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/protocol/urls"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestMessengerShareUrlsSuite(t *testing.T) {
@@ -28,34 +25,6 @@ type MessengerShareUrlsSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerShareUrlsSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger()
-	s.privateKey = s.m.identity
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerShareUrlsSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerShareUrlsSuite) newMessenger() *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-	return messenger
-}
-
 func (s *MessengerShareUrlsSuite) createCommunity() *communities.Community {
 	description := &requests.CreateCommunity{
 		Membership:  protobuf.CommunityPermissions_NO_MEMBERSHIP,
diff --git a/protocol/messenger_sync_clear_history_test.go b/protocol/messenger_sync_clear_history_test.go
index 84a9bc57a..93e9cbc1a 100644
--- a/protocol/messenger_sync_clear_history_test.go
+++ b/protocol/messenger_sync_clear_history_test.go
@@ -8,15 +8,10 @@ import (
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/requests"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 
 	"github.com/stretchr/testify/suite"
-
-	"github.com/status-im/status-go/eth-node/types"
 )
 
 func TestMessengerSyncClearHistorySuite(t *testing.T) {
@@ -27,36 +22,6 @@ type MessengerSyncClearHistory struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerSyncClearHistory) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerSyncClearHistory) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerSyncClearHistory) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 func (s *MessengerSyncClearHistory) pair() *Messenger {
 	theirMessenger, err := newMessengerWithKey(s.shh, s.privateKey, s.logger, nil)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_profile_picture_test.go b/protocol/messenger_sync_profile_picture_test.go
index e5b25b9bd..f3b952f2f 100644
--- a/protocol/messenger_sync_profile_picture_test.go
+++ b/protocol/messenger_sync_profile_picture_test.go
@@ -6,16 +6,11 @@ import (
 	"fmt"
 	"testing"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/images"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 
 	"github.com/stretchr/testify/suite"
-
-	"github.com/status-im/status-go/eth-node/types"
 )
 
 func TestMessengerSyncProfilePictureSuite(t *testing.T) {
@@ -26,36 +21,6 @@ type MessengerSyncProfilePictureSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerSyncProfilePictureSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerSyncProfilePictureSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerSyncProfilePictureSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 func (s *MessengerSyncProfilePictureSuite) TestSyncProfilePicture() {
 
 	// Add identity images
diff --git a/protocol/messenger_sync_wallets_test.go b/protocol/messenger_sync_wallets_test.go
index 9a6433fe7..a8d88e052 100644
--- a/protocol/messenger_sync_wallets_test.go
+++ b/protocol/messenger_sync_wallets_test.go
@@ -5,16 +5,11 @@ import (
 	"errors"
 	"testing"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 
 	"github.com/stretchr/testify/suite"
-
-	"github.com/status-im/status-go/eth-node/types"
 )
 
 func TestMessengerSyncWalletSuite(t *testing.T) {
@@ -25,36 +20,6 @@ type MessengerSyncWalletSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *MessengerSyncWalletSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *MessengerSyncWalletSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *MessengerSyncWalletSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 // user should not be able to change a keypair name directly, it follows display name
 func (s *MessengerSyncWalletSuite) TestProfileKeypairNameChange() {
 	profileKp := accounts.GetProfileKeypairForTest(true, false, false)
diff --git a/protocol/messenger_walletconnect_test.go b/protocol/messenger_walletconnect_test.go
index 563e910e9..23b4b2129 100644
--- a/protocol/messenger_walletconnect_test.go
+++ b/protocol/messenger_walletconnect_test.go
@@ -5,12 +5,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
-	"github.com/status-im/status-go/eth-node/crypto"
-	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/requests"
-	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/waku"
 )
 
 func TestWalletConnectSessionsSuite(t *testing.T) {
@@ -21,36 +16,6 @@ type WalletConnectSessionsSuite struct {
 	MessengerBaseTestSuite
 }
 
-func (s *WalletConnectSessionsSuite) SetupTest() {
-	s.logger = tt.MustCreateTestLogger()
-
-	config := waku.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := waku.New(&config, s.logger)
-	s.shh = gethbridge.NewGethWakuWrapper(shh)
-	s.Require().NoError(shh.Start())
-
-	s.m = s.newMessenger(s.shh)
-	s.privateKey = s.m.identity
-	// We start the messenger in order to receive installations
-	_, err := s.m.Start()
-	s.Require().NoError(err)
-}
-
-func (s *WalletConnectSessionsSuite) TearDownTest() {
-	s.Require().NoError(s.m.Shutdown())
-}
-
-func (s *WalletConnectSessionsSuite) newMessenger(shh types.Waku) *Messenger {
-	privateKey, err := crypto.GenerateKey()
-	s.Require().NoError(err)
-
-	messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
-	s.Require().NoError(err)
-
-	return messenger
-}
-
 func (s *WalletConnectSessionsSuite) TestCreateReadAndDeleteSessions() {
 	peerID1 := "0643983b-0000-2222-1111-b05fdac338zd1"
 	peerID2 := "0643983b-0000-2222-1111-b05fdac338zd2"
diff --git a/protocol/push_notification_test.go b/protocol/push_notification_test.go
index 74b991102..099be60d3 100644
--- a/protocol/push_notification_test.go
+++ b/protocol/push_notification_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/zap"
 
 	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
@@ -33,7 +34,13 @@ func TestMessengerPushNotificationSuite(t *testing.T) {
 }
 
 type MessengerPushNotificationSuite struct {
-	MessengerBaseTestSuite
+	suite.Suite
+	m          *Messenger        // main instance of Messenger
+	privateKey *ecdsa.PrivateKey // private key for the main instance of Messenger
+	// If one wants to send messages between different instances of Messenger,
+	// a single Waku service should be shared.
+	shh    types.Waku
+	logger *zap.Logger
 }
 
 func (s *MessengerPushNotificationSuite) SetupTest() {