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

fix: numeric identifiers and index out of bounds issue on store

This commit is contained in:
Richard Ramos 2021-04-12 13:59:09 -04:00
parent d85c857a74
commit ad9abe601c
No known key found for this signature in database
GPG Key ID: 80D4B01265FDFE8F
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waku/v2/node/wakunode2.go
View File

@ -119,6 +119,10 @@ func (w *WakuNode) Stop() {
}
w.subscriptions = nil
if w.store != nil {
w.store.Stop()
}
}
func (w *WakuNode) Host() host.Host {

12
waku/v2/protocol/waku_store.proto
View File

@ -20,15 +20,15 @@ message PagingInfo {
}
message HistoryQuery {
repeated string topics = 1;
PagingInfo pagingInfo = 2; // used for pagination
double startTime = 3;
double endTime = 4;
repeated string topics = 2;
PagingInfo pagingInfo = 3; // used for pagination
double startTime = 4;
double endTime = 5;
}
message HistoryResponse {
repeated WakuMessage messages = 1;
PagingInfo pagingInfo = 2; // used for pagination
repeated WakuMessage messages = 2;
PagingInfo pagingInfo = 3; // used for pagination
}
message HistoryRPC {

25
waku/v2/protocol/waku_store/waku_store.go
View File

@ -88,28 +88,24 @@ func paginateWithIndex(list []IndexedWakuMessage, pinfo *protocol.PagingInfo) (r
switch dir {
case protocol.PagingInfo_FORWARD: // forward pagination
remainingMessages := len(msgList) - foundIndex - 1
// the number of queried messages cannot exceed the MaxPageSize and the total remaining messages i.e., msgList.len-foundIndex
retrievedPageSize = minOf(int(pageSize), MaxPageSize, remainingMessages)
if initQuery {
remainingMessages = remainingMessages + 1
foundIndex = foundIndex - 1
}
// the number of queried messages cannot exceed the MaxPageSize and the total remaining messages i.e., msgList.len-foundIndex
retrievedPageSize = minOf(int(pageSize), MaxPageSize, remainingMessages)
s = foundIndex + 1 // non inclusive
e = foundIndex + retrievedPageSize
if e < 0 {
e = 0
}
newCursor = msgList[e].index // the new cursor points to the end of the page
case protocol.PagingInfo_BACKWARD: // backward pagination
remainingMessages := foundIndex
// the number of queried messages cannot exceed the MaxPageSize and the total remaining messages i.e., foundIndex-0
retrievedPageSize = minOf(int(pageSize), MaxPageSize, remainingMessages)
if initQuery {
remainingMessages = remainingMessages + 1
foundIndex = foundIndex + 1
}
// the number of queried messages cannot exceed the MaxPageSize and the total remaining messages i.e., foundIndex-0
retrievedPageSize = minOf(int(pageSize), MaxPageSize, remainingMessages)
s = foundIndex - retrievedPageSize
if s >= len(msgList) {
s = len(msgList) - 1
}
e = foundIndex - 1
newCursor = msgList[s].index // the new cursor points to the begining of the page
}
@ -159,7 +155,8 @@ func (w *WakuStore) FindMessages(query *protocol.HistoryQuery) *protocol.History
type MessageProvider interface {
GetAll() ([]*protocol.WakuMessage, error)
Put(message *protocol.WakuMessage) error
Put(cursor *protocol.Index, message *protocol.WakuMessage) error
Stop()
}
type IndexedWakuMessage struct {
@ -212,6 +209,10 @@ func (store *WakuStore) Start() {
go store.storeIncomingMessages()
}
func (store *WakuStore) Stop() {
store.msgProvider.Stop()
}
func (store *WakuStore) storeIncomingMessages() {
for envelope := range store.msg {
index, err := computeIndex(envelope.Message())
@ -228,7 +229,7 @@ func (store *WakuStore) storeIncomingMessages() {
continue
}
err = store.msgProvider.Put(envelope.Message()) // Should the index be stored?
err = store.msgProvider.Put(index, envelope.Message()) // Should the index be stored?
if err != nil {
log.Error("could not store message", err)
continue