status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(waku)_: only use requestId in store query if defined (#5211)

This commit is contained in:
Vaclav Pavlin 2024-05-23 14:26:21 +02:00 committed by GitHub
parent cec5985066
commit d31200e55b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wakuv2/waku.go
View File

@ -1062,7 +1062,9 @@ func (w *Waku) Send(pubsubTopic string, msg *pb.WakuMessage) ([]byte, error) {
func (w *Waku) query(ctx context.Context, peerID peer.ID, pubsubTopic string, topics []common.TopicType, from uint64, to uint64, requestID []byte, opts []legacy_store.HistoryRequestOption) (*legacy_store.Result, error) {
opts = append(opts, legacy_store.WithRequestID(requestID))
if len(requestID) != 0 {
opts = append(opts, legacy_store.WithRequestID(requestID))
}
strTopics := make([]string, len(topics))
for i, t := range topics {

22
wakuv2/waku_test.go
View File

@ -183,7 +183,16 @@ func TestBasicWakuV2(t *testing.T) {
b.InitialInterval = 500 * time.Millisecond
}
err = tt.RetryWithBackOff(func() error {
storeResult, err := w.query(context.Background(), storeNode.PeerID, relay.DefaultWakuTopic, []common.TopicType{contentTopic}, uint64(timestampInSeconds-int64(marginInSeconds)), uint64(timestampInSeconds+int64(marginInSeconds)), []byte{}, []legacy_store.HistoryRequestOption{})
storeResult, err := w.query(
context.Background(),
storeNode.PeerID,
relay.DefaultWakuTopic,
[]common.TopicType{contentTopic},
uint64(timestampInSeconds-int64(marginInSeconds)),
uint64(timestampInSeconds+int64(marginInSeconds)),
[]byte{},
[]legacy_store.HistoryRequestOption{},
)
if err != nil || len(storeResult.Messages) == 0 {
// in case of failure extend timestamp margin up to 40secs
if marginInSeconds < 40 {
@ -461,7 +470,16 @@ func TestWakuV2Store(t *testing.T) {
marginInSeconds := 5
// Query the second node's store for the message
storeResult, err := w1.query(context.Background(), w2.node.Host().ID(), relay.DefaultWakuTopic, []common.TopicType{contentTopic}, uint64(timestampInSeconds-int64(marginInSeconds)), uint64(timestampInSeconds+int64(marginInSeconds)), []byte{}, []legacy_store.HistoryRequestOption{})
storeResult, err := w1.query(
context.Background(),
w2.node.Host().ID(),
relay.DefaultWakuTopic,
[]common.TopicType{contentTopic},
uint64(timestampInSeconds-int64(marginInSeconds)),
uint64(timestampInSeconds+int64(marginInSeconds)),
[]byte{},
[]legacy_store.HistoryRequestOption{},
)
require.NoError(t, err)
require.True(t, len(storeResult.Messages) > 0, "no messages received from store node")
}