diff --git a/protocol/common/message_sender_test.go b/protocol/common/message_sender_test.go
index b32db0b661..1a5bebfac3 100644
--- a/protocol/common/message_sender_test.go
+++ b/protocol/common/message_sender_test.go
@@ -9,6 +9,8 @@ import (
 	wakutypes "github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv2"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/golang/protobuf/proto"
 
 	"github.com/stretchr/testify/suite"
@@ -75,7 +77,7 @@ func (s *MessageSenderSuite) SetupTest() {
 		s.logger,
 		database,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/communities_messenger_test_suite_base_test.go b/protocol/communities_messenger_test_suite_base_test.go
index b732c9a10f..9ef23d50ac 100644
--- a/protocol/communities_messenger_test_suite_base_test.go
+++ b/protocol/communities_messenger_test_suite_base_test.go
@@ -4,6 +4,7 @@ import (
 	"crypto/ecdsa"
 	"math/big"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -55,7 +56,7 @@ func (s *CommunitiesMessengerTestSuiteBase) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_base_test.go b/protocol/messenger_base_test.go
index 22dc010d10..39c85d3b8e 100644
--- a/protocol/messenger_base_test.go
+++ b/protocol/messenger_base_test.go
@@ -3,6 +3,7 @@ package protocol
 import (
 	"crypto/ecdsa"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 
 	"go.uber.org/zap"
@@ -27,7 +28,7 @@ func (s *MessengerBaseTestSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_delete_message_for_me_test.go b/protocol/messenger_delete_message_for_me_test.go
index 8034f95d01..047013fbde 100644
--- a/protocol/messenger_delete_message_for_me_test.go
+++ b/protocol/messenger_delete_message_for_me_test.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -66,7 +67,7 @@ func (s *MessengerDeleteMessageForMeSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_identity_image_test.go b/protocol/messenger_identity_image_test.go
index 0e98f29d42..90d203eebb 100644
--- a/protocol/messenger_identity_image_test.go
+++ b/protocol/messenger_identity_image_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v3"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
@@ -51,7 +52,7 @@ func (s *MessengerProfilePictureHandlerSuite) SetupSuite() {
 		s.logger.Named("Waku"),
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_peersyncing_test.go b/protocol/messenger_peersyncing_test.go
index 7a56e33724..c7bf04dfa4 100644
--- a/protocol/messenger_peersyncing_test.go
+++ b/protocol/messenger_peersyncing_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -49,7 +50,7 @@ func (s *MessengerPeersyncingSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_settings_test.go b/protocol/messenger_settings_test.go
index ffbe6764f9..1a6704c42d 100644
--- a/protocol/messenger_settings_test.go
+++ b/protocol/messenger_settings_test.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/status-im/status-go/wakuv2"
 
 	"github.com/status-im/status-go/eth-node/crypto"
@@ -34,7 +36,7 @@ func (s *MessengerSettingsSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_chat_test.go b/protocol/messenger_sync_chat_test.go
index 1835b8b9a8..0e1fb67cf0 100644
--- a/protocol/messenger_sync_chat_test.go
+++ b/protocol/messenger_sync_chat_test.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -67,7 +68,7 @@ func (s *MessengerSyncChatSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_customization_color_test.go b/protocol/messenger_sync_customization_color_test.go
index 7010f849f6..a38b119a50 100644
--- a/protocol/messenger_sync_customization_color_test.go
+++ b/protocol/messenger_sync_customization_color_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -41,7 +42,7 @@ func (s *MessengerSyncAccountCustomizationColorSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_keycard_change_test.go b/protocol/messenger_sync_keycard_change_test.go
index fc939ac7b5..b862c0edf6 100644
--- a/protocol/messenger_sync_keycard_change_test.go
+++ b/protocol/messenger_sync_keycard_change_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -44,7 +45,7 @@ func (s *MessengerSyncKeycardChangeSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_keycards_state_test.go b/protocol/messenger_sync_keycards_state_test.go
index b014645b5d..e9a6c10f9e 100644
--- a/protocol/messenger_sync_keycards_state_test.go
+++ b/protocol/messenger_sync_keycards_state_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -44,7 +45,7 @@ func (s *MessengerSyncKeycardsStateSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_saved_addresses_test.go b/protocol/messenger_sync_saved_addresses_test.go
index 6b359efb3c..54ebbf0583 100644
--- a/protocol/messenger_sync_saved_addresses_test.go
+++ b/protocol/messenger_sync_saved_addresses_test.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -48,7 +49,7 @@ func (s *MessengerSyncSavedAddressesSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_settings_test.go b/protocol/messenger_sync_settings_test.go
index 8014d72ff8..6f0f7387ef 100644
--- a/protocol/messenger_sync_settings_test.go
+++ b/protocol/messenger_sync_settings_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -87,7 +88,7 @@ func (s *MessengerSyncSettingsSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_waku_wrapper_test.go b/protocol/messenger_waku_wrapper_test.go
index 6739a7056b..6fe134aa54 100644
--- a/protocol/messenger_waku_wrapper_test.go
+++ b/protocol/messenger_waku_wrapper_test.go
@@ -5,6 +5,8 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	wakutypes "github.com/status-im/status-go/waku/types"
 	"github.com/status-im/status-go/wakuv2"
 )
@@ -72,7 +74,7 @@ func newTestWakuWrapper(logger *zap.Logger) (*testWakuWrapper, error) {
 		logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	if err != nil {
diff --git a/protocol/push_notification_test.go b/protocol/push_notification_test.go
index 1edd8bf1e4..1d4c983eff 100644
--- a/protocol/push_notification_test.go
+++ b/protocol/push_notification_test.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -54,7 +55,7 @@ func (s *MessengerPushNotificationSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/protocol/transport/filters_manager_test.go b/protocol/transport/filters_manager_test.go
index 6600e87238..d720a59887 100644
--- a/protocol/transport/filters_manager_test.go
+++ b/protocol/transport/filters_manager_test.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/wakuv2"
 
@@ -96,7 +98,7 @@ func (s *FiltersManagerSuite) SetupTest() {
 		s.logger,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	s.Require().NoError(err)
diff --git a/services/wakuext/api_test.go b/services/wakuext/api_test.go
index c1e92c1895..b3aa6acaf4 100644
--- a/services/wakuext/api_test.go
+++ b/services/wakuext/api_test.go
@@ -10,6 +10,8 @@ import (
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/status-im/status-go/appdatabase"
 	"github.com/status-im/status-go/eth-node/crypto"
@@ -41,7 +43,7 @@ func TestInitProtocol(t *testing.T) {
 		nil,
 		nil,
 		nil,
-		nil,
+		func([]byte, peer.ID, error) {},
 		nil,
 	)
 	require.NoError(t, err)
diff --git a/wakuv1/waku_unsupported.go b/wakuv1/waku_unsupported.go
index f47ab46775..79e7fbcdbb 100644
--- a/wakuv1/waku_unsupported.go
+++ b/wakuv1/waku_unsupported.go
@@ -12,8 +12,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 
-	"github.com/status-im/status-go/waku/types"
 	"github.com/waku-org/go-waku/waku/v2/api/history"
+
+	"github.com/status-im/status-go/waku/types"
 )
 
 var notAvailableStr = "not available in WakuV1"