fix: nil paging info

waku-org · Dec 20, 2022 · 77ace0d · 77ace0d
1 parent 2c6d5cd
commit 77ace0d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/waku/v2/protocol/store/waku_store_client.go b/waku/v2/protocol/store/waku_store_client.go
@@ -342,10 +342,16 @@ func (store *WakuStore) Next(ctx context.Context, r *Result) (*Result, error) {
 		return nil, errors.New("invalid cursor")
 	}
 
-	return &Result{
+	result := &Result{
 		Messages: response.Messages,
-		cursor:   response.PagingInfo.Cursor,
 		query:    q,
 		peerId:   r.PeerID(),
-	}, nil
+	}
+
+	if response.PagingInfo != nil {
+		result.cursor = response.PagingInfo.Cursor
+	}
+
+	return result, nil
+
 }