fix_: tests

status-im · May 13, 2024 · f8abe7f · f8abe7f
1 parent e887700
commit f8abe7f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 10 deletions.
diff --git a/protocol/common/message_sender.go b/protocol/common/message_sender.go
@@ -760,7 +760,7 @@ func (s *MessageSender) unwrapDatasyncMessage(m *v1protocol.StatusMessage, respo
 	response.DatasyncRequests = append(response.DatasyncRequests, datasyncMessage.Requests...)
 	for _, o := range datasyncMessage.GroupOffers {
 		for _, mID := range o.MessageIds {
-			response.DatasyncOffers = append(response.DatasyncOffers, DatasyncOffer{ChatID: o.GroupId, MessageID: mID})
+			response.DatasyncOffers = append(response.DatasyncOffers, DatasyncOffer{GroupID: o.GroupId, MessageID: mID})
 		}
 	}
 
@@ -834,7 +834,7 @@ func (s *MessageSender) HandleMessages(wakuMessage *types.Message) (*HandleMessa
 }
 
 type DatasyncOffer struct {
-	ChatID    []byte
+	GroupID   []byte
 	MessageID []byte
 }
 

diff --git a/protocol/messenger_peersyncing.go b/protocol/messenger_peersyncing.go
@@ -22,7 +22,7 @@ import (
 	v1protocol "github.com/status-im/status-go/protocol/v1"
 )
 
-var peerSyncingLoopInterval = 60 * time.Second
+var peerSyncingLoopInterval time.Duration = 60 * time.Second
 var maxAdvertiseMessages = 40
 
 func (m *Messenger) markDeliveredMessages(acks [][]byte) {
@@ -229,7 +229,7 @@ func (m *Messenger) OnDatasyncOffer(response *common.HandleMessageResponse) erro
 	var offeredMessages []peersyncing.SyncMessage
 
 	for _, o := range offers {
-		offeredMessages = append(offeredMessages, peersyncing.SyncMessage{ChatID: o.ChatID, ID: o.MessageID})
+		offeredMessages = append(offeredMessages, peersyncing.SyncMessage{ChatID: o.GroupID, ID: o.MessageID})
 	}
 
 	messagesToFetch, err := m.peersyncing.OnOffer(offeredMessages)

diff --git a/protocol/migrations/migrations.go b/protocol/migrations/migrations.go
diff --git a/..._rename_peersyncing_group_id_field.up.sql → ..._rename_peersyncing_group_id_field.up.sql b/..._rename_peersyncing_group_id_field.up.sql → ..._rename_peersyncing_group_id_field.up.sql
diff --git a/protocol/peersyncing/peersyncing_test.go b/protocol/peersyncing/peersyncing_test.go
@@ -1,12 +1,12 @@
 package peersyncing
 
 import (
-	"github.com/status-im/status-go/eth-node/types"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
 
 	"github.com/status-im/status-go/appdatabase"
+	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/protocol/sqlite"
 	"github.com/status-im/status-go/t/helpers"
 )