get messenger from account service when local pairing (#3069)

api/geth_backend.go

@@ -1353,9 +1353,9 @@ func (b *GethStatusBackend) SignGroupMembership(content string) (string, error)
 func (b *GethStatusBackend) Messenger() *protocol.Messenger {
 	node := b.StatusNode()
 	if node != nil {
-		wakuExtService := node.WakuExtService()
-		if wakuExtService != nil {
-			return wakuExtService.Messenger()
+		accountService := node.AccountService()
+		if accountService != nil {
+			return accountService.GetMessenger()
 		}
 	}
 	return nil

server/pairing/raw_message_handler.go

@@ -30,7 +30,7 @@ func NewSyncRawMessageHandler(backend *api.GethStatusBackend) *SyncRawMessageHan
 func (s *SyncRawMessageHandler) PrepareRawMessage(keyUID string) ([]byte, error) {
 	messenger := s.backend.Messenger()
 	if messenger == nil {
-		return nil, fmt.Errorf("messenger is nil when handlePairingSyncDeviceSend")
+		return nil, fmt.Errorf("messenger is nil when PrepareRawMessage")
 	}
 
 	currentAccount, err := s.backend.GetActiveAccount()
@@ -112,6 +112,9 @@ func (s *SyncRawMessageHandler) HandleRawMessage(account *multiaccounts.Account,
 	}
 
 	messenger := s.backend.Messenger()
+	if messenger == nil {
+		return fmt.Errorf("messenger is nil when HandleRawMessage")
+	}
 	return messenger.HandleSyncRawMessages(rawMessages)
 }
 

services/accounts/service.go

@@ -78,3 +78,7 @@ func (s *Service) GetAccountsByKeyUID(keyUID string) ([]*accounts.Account, error
 func (s *Service) GetSettings() (settings.Settings, error) {
 	return s.db.GetSettings()
 }
+
+func (s *Service) GetMessenger() *protocol.Messenger {
+	return s.messenger
+}