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

feat_: use storev3 instead of v2 for history queries (#5123)

This commit is contained in:
richΛrd 2024-07-30 14:28:27 -04:00 committed by GitHub
parent 19b5bcf3ce
commit 5d309e2c64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 78 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth-node/bridge/geth/waku.go
View File

@ -291,7 +291,7 @@ func (w *GethWakuWrapper) MarkP2PMessageAsProcessed(hash common.Hash) {
w.waku.MarkP2PMessageAsProcessed(hash) w.waku.MarkP2PMessageAsProcessed(hash)
} }
func (w *GethWakuWrapper) RequestStoreMessages(ctx context.Context, peerID []byte, r types.MessagesRequest, processEnvelopes bool) (*types.StoreRequestCursor, int, error) { func (w *GethWakuWrapper) RequestStoreMessages(ctx context.Context, peerID []byte, r types.MessagesRequest, processEnvelopes bool) (types.StoreRequestCursor, int, error) {
return nil, 0, errors.New("not implemented") return nil, 0, errors.New("not implemented")
} }

42
eth-node/bridge/geth/wakuv2.go
View File

@ -9,8 +9,8 @@ import (
"github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peer"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"github.com/waku-org/go-waku/waku/v2/protocol/legacy_store" "github.com/waku-org/go-waku/waku/v2/protocol"
storepb "github.com/waku-org/go-waku/waku/v2/protocol/legacy_store/pb" "github.com/waku-org/go-waku/waku/v2/protocol/store"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/status-im/status-go/connection" "github.com/status-im/status-go/connection"
@ -177,35 +177,32 @@ func (w *gethWakuV2Wrapper) SendMessagesRequest(peerID []byte, r types.MessagesR
return errors.New("DEPRECATED") return errors.New("DEPRECATED")
} }
func (w *gethWakuV2Wrapper) RequestStoreMessages(ctx context.Context, peerID []byte, r types.MessagesRequest, processEnvelopes bool) (*types.StoreRequestCursor, int, error) { func (w *gethWakuV2Wrapper) RequestStoreMessages(ctx context.Context, peerID []byte, r types.MessagesRequest, processEnvelopes bool) (types.StoreRequestCursor, int, error) {
var options []legacy_store.HistoryRequestOption var options []store.RequestOption
peer, err := peer.Decode(string(peerID)) peer, err := peer.Decode(string(peerID))
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
options = []legacy_store.HistoryRequestOption{ options = []store.RequestOption{
legacy_store.WithPaging(false, uint64(r.Limit)), store.WithPaging(false, uint64(r.Limit)),
} }
var cursor *storepb.Index var cursor []byte
if r.StoreCursor != nil { if r.StoreCursor != nil {
cursor = &storepb.Index{ cursor = r.StoreCursor
Digest: r.StoreCursor.Digest,
ReceiverTime: r.StoreCursor.ReceiverTime,
SenderTime: r.StoreCursor.SenderTime,
PubsubTopic: r.StoreCursor.PubsubTopic,
}
} }
query := legacy_store.Query{ contentTopics := []string{}
StartTime: proto.Int64(int64(r.From) * int64(time.Second)),
EndTime: proto.Int64(int64(r.To) * int64(time.Second)),
PubsubTopic: w.waku.GetPubsubTopic(r.PubsubTopic),
}
for _, topic := range r.ContentTopics { for _, topic := range r.ContentTopics {
query.ContentTopics = append(query.ContentTopics, wakucommon.BytesToTopic(topic).ContentTopic()) contentTopics = append(contentTopics, wakucommon.BytesToTopic(topic).ContentTopic())
}
query := store.FilterCriteria{
TimeStart: proto.Int64(int64(r.From) * int64(time.Second)),
TimeEnd: proto.Int64(int64(r.To) * int64(time.Second)),
ContentFilter: protocol.NewContentFilter(w.waku.GetPubsubTopic(r.PubsubTopic), contentTopics...),
} }
pbCursor, envelopesCount, err := w.waku.Query(ctx, peer, query, cursor, options, processEnvelopes) pbCursor, envelopesCount, err := w.waku.Query(ctx, peer, query, cursor, options, processEnvelopes)
@ -214,12 +211,7 @@ func (w *gethWakuV2Wrapper) RequestStoreMessages(ctx context.Context, peerID []b
} }
if pbCursor != nil { if pbCursor != nil {
return &types.StoreRequestCursor{ return pbCursor, envelopesCount, nil
Digest: pbCursor.Digest,
ReceiverTime: pbCursor.ReceiverTime,
SenderTime: pbCursor.SenderTime,
PubsubTopic: pbCursor.PubsubTopic,
}, envelopesCount, nil
} }
return nil, envelopesCount, nil return nil, envelopesCount, nil

9
eth-node/types/mailserver.go
View File

@ -25,7 +25,7 @@ type MessagesRequest struct {
// Cursor is used as starting point for paginated requests. // Cursor is used as starting point for paginated requests.
Cursor []byte `json:"cursor"` Cursor []byte `json:"cursor"`
// StoreCursor is used as starting point for WAKUV2 paginatedRequests // StoreCursor is used as starting point for WAKUV2 paginatedRequests
StoreCursor *StoreRequestCursor `json:"storeCursor"` StoreCursor StoreRequestCursor `json:"storeCursor"`
// Bloom is a filter to match requested messages. // Bloom is a filter to match requested messages.
Bloom []byte `json:"bloom"` Bloom []byte `json:"bloom"`
// PubsubTopic is the gossipsub topic on which the message was broadcasted // PubsubTopic is the gossipsub topic on which the message was broadcasted
@ -35,12 +35,7 @@ type MessagesRequest struct {
ContentTopics [][]byte `json:"contentTopics"` ContentTopics [][]byte `json:"contentTopics"`
} }
type StoreRequestCursor struct { type StoreRequestCursor []byte
Digest []byte `json:"digest"`
ReceiverTime int64 `json:"receiverTime"`
SenderTime int64 `json:"senderTime"`
PubsubTopic string `json:"pubsubTopic"`
}
// SetDefaults sets the From and To defaults // SetDefaults sets the From and To defaults
func (r *MessagesRequest) SetDefaults(now time.Time) { func (r *MessagesRequest) SetDefaults(now time.Time) {

3
eth-node/types/waku.go
View File

@ -16,7 +16,6 @@ import (
type ConnStatus struct { type ConnStatus struct {
IsOnline bool `json:"isOnline"` IsOnline bool `json:"isOnline"`
HasHistory bool `json:"hasHistory"`
Peers map[string]WakuV2Peer `json:"peers"` Peers map[string]WakuV2Peer `json:"peers"`
} }
@ -176,7 +175,7 @@ type Waku interface {
SendMessagesRequest(peerID []byte, request MessagesRequest) error SendMessagesRequest(peerID []byte, request MessagesRequest) error
// RequestStoreMessages uses the WAKU2-STORE protocol to request historic messages // RequestStoreMessages uses the WAKU2-STORE protocol to request historic messages
RequestStoreMessages(ctx context.Context, peerID []byte, request MessagesRequest, processEnvelopes bool) (*StoreRequestCursor, int, error) RequestStoreMessages(ctx context.Context, peerID []byte, request MessagesRequest, processEnvelopes bool) (StoreRequestCursor, int, error)
// ProcessingP2PMessages indicates whether there are in-flight p2p messages // ProcessingP2PMessages indicates whether there are in-flight p2p messages
ProcessingP2PMessages() bool ProcessingP2PMessages() bool

6
protocol/messenger_mailserver.go
View File

@ -707,7 +707,7 @@ type work struct {
pubsubTopic string pubsubTopic string
contentTopics []types.TopicType contentTopics []types.TopicType
cursor []byte cursor []byte
storeCursor *types.StoreRequestCursor storeCursor types.StoreRequestCursor
limit uint32 limit uint32
} }
@ -717,13 +717,13 @@ type messageRequester interface {
peerID []byte, peerID []byte,
from, to uint32, from, to uint32,
previousCursor []byte, previousCursor []byte,
previousStoreCursor *types.StoreRequestCursor, previousStoreCursor types.StoreRequestCursor,
pubsubTopic string, pubsubTopic string,
contentTopics []types.TopicType, contentTopics []types.TopicType,
limit uint32, limit uint32,
waitForResponse bool, waitForResponse bool,
processEnvelopes bool, processEnvelopes bool,
) (cursor []byte, storeCursor *types.StoreRequestCursor, envelopesCount int, err error) ) (cursor []byte, storeCursor types.StoreRequestCursor, envelopesCount int, err error)
} }
func processMailserverBatch( func processMailserverBatch(

4
protocol/messenger_mailserver_processMailserverBatch_test.go
View File

@ -40,13 +40,13 @@ func (t *mockTransport) SendMessagesRequestForTopics(
peerID []byte, peerID []byte,
from, to uint32, from, to uint32,
previousCursor []byte, previousCursor []byte,
previousStoreCursor *types.StoreRequestCursor, previousStoreCursor types.StoreRequestCursor,
pubsubTopic string, pubsubTopic string,
contentTopics []types.TopicType, contentTopics []types.TopicType,
limit uint32, limit uint32,
waitForResponse bool, waitForResponse bool,
processEnvelopes bool, processEnvelopes bool,
) (cursor []byte, storeCursor *types.StoreRequestCursor, envelopesCount int, err error) { ) (cursor []byte, storeCursor types.StoreRequestCursor, envelopesCount int, err error) {
var response queryResponse var response queryResponse
if previousCursor == nil { if previousCursor == nil {
initialResponse := getInitialResponseKey(contentTopics) initialResponse := getInitialResponseKey(contentTopics)

4
protocol/messenger_storenode_comunity_test.go
View File

@ -30,6 +30,7 @@ import (
) )
func TestMessengerStoreNodeCommunitySuite(t *testing.T) { func TestMessengerStoreNodeCommunitySuite(t *testing.T) {
t.Skip("requires storev3 node")
suite.Run(t, new(MessengerStoreNodeCommunitySuite)) suite.Run(t, new(MessengerStoreNodeCommunitySuite))
} }
@ -283,7 +284,8 @@ func (s *MessengerStoreNodeCommunitySuite) TestSetCommunityStorenodesAndFetch()
} }
func (s *MessengerStoreNodeCommunitySuite) TestSetStorenodeForCommunity_fetchMessagesFromNewStorenode() { func (s *MessengerStoreNodeCommunitySuite) TestSetStorenodeForCommunity_fetchMessagesFromNewStorenode() {
s.T().Skip("flaky test") s.T().Skip("flaky")
err := s.owner.DialPeer(s.storeNodeAddress) err := s.owner.DialPeer(s.storeNodeAddress)
s.Require().NoError(err) s.Require().NoError(err)
err = s.bob.DialPeer(s.storeNodeAddress) err = s.bob.DialPeer(s.storeNodeAddress)

3
protocol/messenger_storenode_request_test.go
View File

@ -44,6 +44,7 @@ const (
) )
func TestMessengerStoreNodeRequestSuite(t *testing.T) { func TestMessengerStoreNodeRequestSuite(t *testing.T) {
t.Skip("requires storev3 node")
suite.Run(t, new(MessengerStoreNodeRequestSuite)) suite.Run(t, new(MessengerStoreNodeRequestSuite))
} }
@ -382,7 +383,7 @@ func (s *MessengerStoreNodeRequestSuite) ensureStoreNodeEnvelopes(contentTopic *
PubsubTopic: "", PubsubTopic: "",
ContentTopics: []string{contentTopic.ContentTopic()}, ContentTopics: []string{contentTopic.ContentTopic()},
} }
result, err := s.wakuStoreNode.StoreNode().Query(context.Background(), query, queryOptions...) result, err := s.wakuStoreNode.LegacyStoreNode().Query(context.Background(), query, queryOptions...)
s.Require().NoError(err) s.Require().NoError(err)
s.Require().GreaterOrEqual(len(result.Messages), minimumCount) s.Require().GreaterOrEqual(len(result.Messages), minimumCount)
s.logger.Debug("store node query result", zap.Int("messagesCount", len(result.Messages))) s.logger.Debug("store node query result", zap.Int("messagesCount", len(result.Messages)))

14
protocol/transport/transport.go
View File

@ -500,18 +500,18 @@ func (t *Transport) createMessagesRequestV2(
ctx context.Context, ctx context.Context,
peerID []byte, peerID []byte,
from, to uint32, from, to uint32,
previousStoreCursor *types.StoreRequestCursor, previousStoreCursor types.StoreRequestCursor,
pubsubTopic string, pubsubTopic string,
contentTopics []types.TopicType, contentTopics []types.TopicType,
limit uint32, limit uint32,
waitForResponse bool, waitForResponse bool,
processEnvelopes bool, processEnvelopes bool,
) (storeCursor *types.StoreRequestCursor, envelopesCount int, err error) { ) (storeCursor types.StoreRequestCursor, envelopesCount int, err error) {
r := createMessagesRequest(from, to, nil, previousStoreCursor, pubsubTopic, contentTopics, limit) r := createMessagesRequest(from, to, nil, previousStoreCursor, pubsubTopic, contentTopics, limit)
if waitForResponse { if waitForResponse {
resultCh := make(chan struct { resultCh := make(chan struct {
storeCursor *types.StoreRequestCursor storeCursor types.StoreRequestCursor
envelopesCount int envelopesCount int
err error err error
}) })
@ -519,7 +519,7 @@ func (t *Transport) createMessagesRequestV2(
go func() { go func() {
storeCursor, envelopesCount, err = t.waku.RequestStoreMessages(ctx, peerID, r, processEnvelopes) storeCursor, envelopesCount, err = t.waku.RequestStoreMessages(ctx, peerID, r, processEnvelopes)
resultCh <- struct { resultCh <- struct {
storeCursor *types.StoreRequestCursor storeCursor types.StoreRequestCursor
envelopesCount int envelopesCount int
err error err error
}{storeCursor, envelopesCount, err} }{storeCursor, envelopesCount, err}
@ -548,13 +548,13 @@ func (t *Transport) SendMessagesRequestForTopics(
peerID []byte, peerID []byte,
from, to uint32, from, to uint32,
previousCursor []byte, previousCursor []byte,
previousStoreCursor *types.StoreRequestCursor, previousStoreCursor types.StoreRequestCursor,
pubsubTopic string, pubsubTopic string,
contentTopics []types.TopicType, contentTopics []types.TopicType,
limit uint32, limit uint32,
waitForResponse bool, waitForResponse bool,
processEnvelopes bool, processEnvelopes bool,
) (cursor []byte, storeCursor *types.StoreRequestCursor, envelopesCount int, err error) { ) (cursor []byte, storeCursor types.StoreRequestCursor, envelopesCount int, err error) {
switch t.waku.Version() { switch t.waku.Version() {
case 2: case 2:
storeCursor, envelopesCount, err = t.createMessagesRequestV2(ctx, peerID, from, to, previousStoreCursor, pubsubTopic, contentTopics, limit, waitForResponse, processEnvelopes) storeCursor, envelopesCount, err = t.createMessagesRequestV2(ctx, peerID, from, to, previousStoreCursor, pubsubTopic, contentTopics, limit, waitForResponse, processEnvelopes)
@ -566,7 +566,7 @@ func (t *Transport) SendMessagesRequestForTopics(
return return
} }
func createMessagesRequest(from, to uint32, cursor []byte, storeCursor *types.StoreRequestCursor, pubsubTopic string, topics []types.TopicType, limit uint32) types.MessagesRequest { func createMessagesRequest(from, to uint32, cursor []byte, storeCursor types.StoreRequestCursor, pubsubTopic string, topics []types.TopicType, limit uint32) types.MessagesRequest {
aUUID := uuid.New() aUUID := uuid.New()
// uuid is 16 bytes, converted to hex it's 32 bytes as expected by types.MessagesRequest // uuid is 16 bytes, converted to hex it's 32 bytes as expected by types.MessagesRequest
id := []byte(hex.EncodeToString(aUUID[:])) id := []byte(hex.EncodeToString(aUUID[:]))

41
wakuv2/waku.go
View File

@ -62,7 +62,6 @@ import (
"github.com/waku-org/go-waku/waku/v2/protocol" "github.com/waku-org/go-waku/waku/v2/protocol"
"github.com/waku-org/go-waku/waku/v2/protocol/filter" "github.com/waku-org/go-waku/waku/v2/protocol/filter"
"github.com/waku-org/go-waku/waku/v2/protocol/legacy_store" "github.com/waku-org/go-waku/waku/v2/protocol/legacy_store"
storepb "github.com/waku-org/go-waku/waku/v2/protocol/legacy_store/pb"
"github.com/waku-org/go-waku/waku/v2/protocol/lightpush" "github.com/waku-org/go-waku/waku/v2/protocol/lightpush"
"github.com/waku-org/go-waku/waku/v2/protocol/peer_exchange" "github.com/waku-org/go-waku/waku/v2/protocol/peer_exchange"
"github.com/waku-org/go-waku/waku/v2/protocol/relay" "github.com/waku-org/go-waku/waku/v2/protocol/relay"
@ -1261,26 +1260,26 @@ func (w *Waku) messageHashBasedQuery(ctx context.Context, hashes []gethcommon.Ha
return append(ackHashes, missedHashes...) return append(ackHashes, missedHashes...)
} }
func (w *Waku) Query(ctx context.Context, peerID peer.ID, query legacy_store.Query, cursor *storepb.Index, opts []legacy_store.HistoryRequestOption, processEnvelopes bool) (*storepb.Index, int, error) { func (w *Waku) Query(ctx context.Context, peerID peer.ID, query store.FilterCriteria, cursor []byte, opts []store.RequestOption, processEnvelopes bool) ([]byte, int, error) {
requestID := protocol.GenerateRequestID() requestID := protocol.GenerateRequestID()
opts = append(opts, opts = append(opts,
legacy_store.WithRequestID(requestID), store.WithRequestID(requestID),
legacy_store.WithPeer(peerID), store.WithPeer(peerID),
legacy_store.WithCursor(cursor)) store.WithCursor(cursor))
logger := w.logger.With(zap.String("requestID", hexutil.Encode(requestID)), zap.Stringer("peerID", peerID)) logger := w.logger.With(zap.String("requestID", hexutil.Encode(requestID)), zap.Stringer("peerID", peerID))
logger.Debug("store.query", logger.Debug("store.query",
logutils.WakuMessageTimestamp("startTime", query.StartTime), logutils.WakuMessageTimestamp("startTime", query.TimeStart),
logutils.WakuMessageTimestamp("endTime", query.EndTime), logutils.WakuMessageTimestamp("endTime", query.TimeEnd),
zap.Strings("contentTopics", query.ContentTopics), zap.Strings("contentTopics", query.ContentTopics.ToList()),
zap.String("pubsubTopic", query.PubsubTopic), zap.String("pubsubTopic", query.PubsubTopic),
zap.Stringer("cursor", cursor), zap.String("cursor", hexutil.Encode(cursor)),
) )
queryStart := time.Now() queryStart := time.Now()
result, err := w.node.LegacyStore().Query(ctx, query, opts...) result, err := w.node.Store().Query(ctx, query, opts...)
queryDuration := time.Since(queryStart) queryDuration := time.Since(queryStart)
if err != nil { if err != nil {
logger.Error("error querying storenode", zap.Error(err)) logger.Error("error querying storenode", zap.Error(err))
@ -1291,15 +1290,15 @@ func (w *Waku) Query(ctx context.Context, peerID peer.ID, query legacy_store.Que
return nil, 0, err return nil, 0, err
} }
logger.Debug("store.query response", messages := result.Messages()
zap.Duration("queryDuration", queryDuration), envelopesCount := len(messages)
zap.Int("numMessages", len(result.Messages)), w.logger.Debug("store.query response", zap.Duration("queryDuration", queryDuration), zap.Int("numMessages", envelopesCount), zap.Bool("hasCursor", result.IsComplete() && result.Cursor() != nil))
zap.Stringer("cursor", result.Cursor())) for _, mkv := range messages {
msg := mkv.Message
for _, msg := range result.Messages {
// Temporarily setting RateLimitProof to nil so it matches the WakuMessage protobuffer we are sending // Temporarily setting RateLimitProof to nil so it matches the WakuMessage protobuffer we are sending
// See https://github.com/vacp2p/rfc/issues/563 // See https://github.com/vacp2p/rfc/issues/563
msg.RateLimitProof = nil mkv.Message.RateLimitProof = nil
envelope := protocol.NewEnvelope(msg, msg.GetTimestamp(), query.PubsubTopic) envelope := protocol.NewEnvelope(msg, msg.GetTimestamp(), query.PubsubTopic)
logger.Info("received waku2 store message", logger.Info("received waku2 store message",
@ -1314,7 +1313,7 @@ func (w *Waku) Query(ctx context.Context, peerID peer.ID, query legacy_store.Que
} }
} }
return result.Cursor(), len(result.Messages), nil return result.Cursor(), envelopesCount, nil
} }
// Start implements node.Service, starting the background data propagation thread // Start implements node.Service, starting the background data propagation thread
@ -1927,7 +1926,7 @@ func (w *Waku) AddStorePeer(address string) (peer.ID, error) {
return "", err return "", err
} }
peerID, err := w.node.AddPeer(addr, wps.Static, w.cfg.DefaultShardedPubsubTopics, legacy_store.StoreID_v20beta4) peerID, err := w.node.AddPeer(addr, wps.Static, w.cfg.DefaultShardedPubsubTopics, store.StoreQueryID_v300)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -2055,6 +2054,10 @@ func FormatPeerStats(wakuNode *node.WakuNode) map[string]types.WakuV2Peer {
return p return p
} }
func (w *Waku) StoreNode() legacy_store.Store { func (w *Waku) StoreNode() *store.WakuStore {
return w.node.Store()
}
func (w *Waku) LegacyStoreNode() legacy_store.Store {
return w.node.LegacyStore() return w.node.LegacyStore()
} }

30
wakuv2/waku_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/cenkalti/backoff/v3" "github.com/cenkalti/backoff/v3"
"github.com/libp2p/go-libp2p/core/metrics" "github.com/libp2p/go-libp2p/core/metrics"
"github.com/libp2p/go-libp2p/core/protocol" libp2pprotocol "github.com/libp2p/go-libp2p/core/protocol"
ethcommon "github.com/ethereum/go-ethereum/common" ethcommon "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
@ -29,11 +29,13 @@ import (
"github.com/waku-org/go-waku/waku/v2/dnsdisc" "github.com/waku-org/go-waku/waku/v2/dnsdisc"
wps "github.com/waku-org/go-waku/waku/v2/peerstore" wps "github.com/waku-org/go-waku/waku/v2/peerstore"
"github.com/waku-org/go-waku/waku/v2/protocol"
"github.com/waku-org/go-waku/waku/v2/protocol/filter" "github.com/waku-org/go-waku/waku/v2/protocol/filter"
"github.com/waku-org/go-waku/waku/v2/protocol/legacy_store" "github.com/waku-org/go-waku/waku/v2/protocol/legacy_store"
"github.com/waku-org/go-waku/waku/v2/protocol/lightpush" "github.com/waku-org/go-waku/waku/v2/protocol/lightpush"
"github.com/waku-org/go-waku/waku/v2/protocol/pb" "github.com/waku-org/go-waku/waku/v2/protocol/pb"
"github.com/waku-org/go-waku/waku/v2/protocol/relay" "github.com/waku-org/go-waku/waku/v2/protocol/relay"
"github.com/waku-org/go-waku/waku/v2/protocol/store"
"github.com/status-im/status-go/appdatabase" "github.com/status-im/status-go/appdatabase"
"github.com/status-im/status-go/connection" "github.com/status-im/status-go/connection"
@ -237,14 +239,13 @@ func TestBasicWakuV2(t *testing.T) {
_, envelopeCount, err := w.Query( _, envelopeCount, err := w.Query(
context.Background(), context.Background(),
storeNode.PeerID, storeNode.PeerID,
legacy_store.Query{ store.FilterCriteria{
PubsubTopic: config.DefaultShardPubsubTopic, ContentFilter: protocol.NewContentFilter(config.DefaultShardPubsubTopic, contentTopic.ContentTopic()),
ContentTopics: []string{contentTopic.ContentTopic()}, TimeStart: proto.Int64((timestampInSeconds - int64(marginInSeconds)) * int64(time.Second)),
StartTime: proto.Int64((timestampInSeconds - int64(marginInSeconds)) * int64(time.Second)), TimeEnd: proto.Int64((timestampInSeconds + int64(marginInSeconds)) * int64(time.Second)),
EndTime: proto.Int64((timestampInSeconds + int64(marginInSeconds)) * int64(time.Second)),
}, },
nil, nil,
[]legacy_store.HistoryRequestOption{}, nil,
false, false,
) )
if err != nil || envelopeCount == 0 { if err != nil || envelopeCount == 0 {
@ -454,6 +455,8 @@ func TestWakuV2Filter(t *testing.T) {
} }
func TestWakuV2Store(t *testing.T) { func TestWakuV2Store(t *testing.T) {
t.Skip("deprecated. Storenode must use nwaku")
// Configuration for the first Waku node // Configuration for the first Waku node
config1 := &Config{ config1 := &Config{
Port: 0, Port: 0,
@ -543,14 +546,13 @@ func TestWakuV2Store(t *testing.T) {
_, envelopeCount, err := w1.Query( _, envelopeCount, err := w1.Query(
context.Background(), context.Background(),
w2.node.Host().ID(), w2.node.Host().ID(),
legacy_store.Query{ store.FilterCriteria{
PubsubTopic: config1.DefaultShardPubsubTopic, TimeStart: proto.Int64((timestampInSeconds - int64(marginInSeconds)) * int64(time.Second)),
ContentTopics: []string{contentTopic.ContentTopic()}, TimeEnd: proto.Int64((timestampInSeconds + int64(marginInSeconds)) * int64(time.Second)),
StartTime: proto.Int64((timestampInSeconds - int64(marginInSeconds)) * int64(time.Second)), ContentFilter: protocol.NewContentFilter(config1.DefaultShardPubsubTopic, contentTopic.ContentTopic()),
EndTime: proto.Int64((timestampInSeconds + int64(marginInSeconds)) * int64(time.Second)),
}, },
nil, nil,
[]legacy_store.HistoryRequestOption{}, nil,
false, false,
) )
require.NoError(t, err) require.NoError(t, err)
@ -804,7 +806,7 @@ func TestTelemetryFormat(t *testing.T) {
RateOut: 40, RateOut: 40,
} }
m := make(map[protocol.ID]metrics.Stats) m := make(map[libp2pprotocol.ID]metrics.Stats)
m[relay.WakuRelayID_v200] = s m[relay.WakuRelayID_v200] = s
m[filter.FilterPushID_v20beta1] = s m[filter.FilterPushID_v20beta1] = s
m[filter.FilterSubscribeID_v20beta1] = s m[filter.FilterSubscribeID_v20beta1] = s