Test fix

status-im · Apr 15, 2024 · 752ec5a · 752ec5a
1 parent 5aaf245
commit 752ec5a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 37 deletions.
diff --git a/protocol/messenger_peersyncing.go b/protocol/messenger_peersyncing.go
@@ -146,23 +146,15 @@ func (m *Messenger) sendDatasyncOffersForCommunities() error {
 		for id := range community.Chats() {
 			chatIDs = append(chatIDs, []byte(community.IDString()+id))
 		}
-
 		if len(chatIDs) == 0 {
 			continue
 		}
-
-		availableMessages, err := m.peersyncing.AvailableMessagesByChatIDs(chatIDs, maxAdvertiseMessages)
+		availableMessagesMap, err := m.peersyncing.AvailableMessagesMapByChatIDs(chatIDs, maxAdvertiseMessages)
 		if err != nil {
 			return err
 		}
-		availableMessagesMap := make(map[string][][]byte)
-		for _, m := range availableMessages {
-			chatID := types.Bytes2Hex(m.ChatID)
-			availableMessagesMap[chatID] = append(availableMessagesMap[chatID], m.ID)
-		}
-
 		datasyncMessage := &datasyncproto.Payload{}
-		if len(availableMessages) == 0 {
+		if len(availableMessagesMap) == 0 {
 			continue
 		}
 		for chatID, m := range availableMessagesMap {
@@ -189,18 +181,12 @@ func (m *Messenger) sendDatasyncOffersForCommunities() error {
 func (m *Messenger) sendDatasyncOffersForChats() error {
 	for _, chat := range m.Chats() {
 		chatIDBytes := []byte(chat.ID)
-		chatIDHex := types.Bytes2Hex(chatIDBytes)
-		availableMessages, err := m.peersyncing.AvailableMessagesByChatIDs([][]byte{chatIDBytes}, maxAdvertiseMessages)
+		availableMessagesMap, err := m.peersyncing.AvailableMessagesMapByChatIDs([][]byte{chatIDBytes}, maxAdvertiseMessages)
 		if err != nil {
 			return err
 		}
-		availableMessagesMap := make(map[string][][]byte)
-		for _, message := range availableMessages {
-			availableMessagesMap[chatIDHex] = append(availableMessagesMap[chatIDHex], message.ID)
-		}
-
 		datasyncMessage := &datasyncproto.Payload{}
-		if len(availableMessages) == 0 {
+		if len(availableMessagesMap) == 0 {
 			continue
 		}
 		for _, message := range availableMessagesMap {

diff --git a/protocol/peersyncing/peersyncing.go b/protocol/peersyncing/peersyncing.go
@@ -1,5 +1,7 @@
 package peersyncing
 
+import "github.com/status-im/status-go/eth-node/types"
+
 type PeerSyncing struct {
 	persistence SyncMessagePersistence
 	config      Config
@@ -25,8 +27,17 @@ func (p *PeerSyncing) AvailableMessages() ([]SyncMessage, error) {
 	return p.persistence.All()
 }
 
-func (p *PeerSyncing) AvailableMessagesByChatIDs(groupIDs [][]byte, limit int) ([]SyncMessage, error) {
-	return p.persistence.ByChatIDs(groupIDs, limit)
+func (p *PeerSyncing) AvailableMessagesMapByChatIDs(groupIDs [][]byte, limit int) (map[string][][]byte, error) {
+	availableMessages, err := p.persistence.ByChatIDs(groupIDs, limit)
+	if err != nil {
+		return nil, err
+	}
+	availableMessagesMap := make(map[string][][]byte)
+	for _, m := range availableMessages {
+		chatID := types.Bytes2Hex(m.ChatID)
+		availableMessagesMap[chatID] = append(availableMessagesMap[chatID], m.ID)
+	}
+	return availableMessagesMap, err
 }
 
 func (p *PeerSyncing) MessagesByIDs(messageIDs [][]byte) ([]SyncMessage, error) {

diff --git a/protocol/peersyncing/peersyncing_test.go b/protocol/peersyncing/peersyncing_test.go
@@ -48,15 +48,15 @@ func (s *PeerSyncingSuite) TestBasic() {
 	s.Require().NoError(err)
 	s.Require().Len(allMessages, 1)
 
-	byGroupID, err := s.p.AvailableMessagesByChatIDs([][]byte{syncMessage.ChatID}, 10)
+	byChatID, err := s.p.AvailableMessagesMapByChatIDs([][]byte{syncMessage.ChatID}, 10)
 
 	s.Require().NoError(err)
-	s.Require().Len(byGroupID, 1)
+	s.Require().Len(byChatID, 1)
 
-	byGroupID, err = s.p.AvailableMessagesByChatIDs([][]byte{[]byte("random-group-id")}, 10)
+	byChatID, err = s.p.AvailableMessagesMapByChatIDs([][]byte{[]byte("random-group-id")}, 10)
 
 	s.Require().NoError(err)
-	s.Require().Len(byGroupID, 0)
+	s.Require().Len(byChatID, 0)
 
 	newSyncMessage := SyncMessage{
 		ID:        []byte("test-id-2"),
@@ -112,22 +112,13 @@ func (s *PeerSyncingSuite) TestOrderAndLimit() {
 	s.Require().NoError(s.p.Add(syncMessage3))
 	s.Require().NoError(s.p.Add(syncMessage4))
 
-	byGroupID, err := s.p.AvailableMessagesByChatIDs([][]byte{testCommunityID}, 10)
+	byChatID, err := s.p.AvailableMessagesMapByChatIDs([][]byte{testCommunityID}, 10)
 
 	s.Require().NoError(err)
-	s.Require().Len(byGroupID, 4)
+	s.Require().Len(byChatID, 4)
 
-	s.Require().Equal(syncMessage1.ID, byGroupID[3].ID)
-	s.Require().Equal(syncMessage2.ID, byGroupID[2].ID)
-	s.Require().Equal(syncMessage3.ID, byGroupID[1].ID)
-	s.Require().Equal(syncMessage4.ID, byGroupID[0].ID)
-
-	byGroupID, err = s.p.AvailableMessagesByChatIDs([][]byte{testCommunityID}, 3)
+	byChatID, err = s.p.AvailableMessagesMapByChatIDs([][]byte{testCommunityID}, 3)
 
 	s.Require().NoError(err)
-	s.Require().Len(byGroupID, 3)
-
-	s.Require().Equal(syncMessage2.ID, byGroupID[2].ID)
-	s.Require().Equal(syncMessage3.ID, byGroupID[1].ID)
-	s.Require().Equal(syncMessage4.ID, byGroupID[0].ID)
+	s.Require().Len(byChatID, 3)
 }