Skip to content

Commit

Permalink
Merge #893
Browse files Browse the repository at this point in the history
893: fix: do not throw on lack of response r=fryorcraken a=fryorcraken

Expected proto3 behaviour, just no message returned.

Co-authored-by: fryorcraken.eth <git@fryorcraken.xyz>
  • Loading branch information
status-bors-ng[bot] and fryorcraken committed Aug 17, 2022
2 parents 28cb144 + 28f77ec commit 6781166
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/lib/waku_store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export class WakuStore {
const reply = historyRpcQuery.decode(bytes);

if (!reply.response) {
throw "History response misses response field";
dbg("No message returned from store: `response` field missing");
}

const response = reply.response as protoV2Beta4.HistoryResponse;
Expand All @@ -227,7 +227,7 @@ export class WakuStore {

if (!response.messages || !response.messages.length) {
// No messages left (or stored)
console.log("No messages present in HistoryRPC response");
dbg("No message returned from store: `messages` array empty");
return messages;
}

Expand Down Expand Up @@ -265,8 +265,8 @@ export class WakuStore {
cursor = response.pagingInfo?.cursor;
if (cursor === undefined) {
// If the server does not return cursor then there is an issue,
// Need to abort or we end up in an infinite loop
console.log("No cursor returned by peer.");
// Need to abort, or we end up in an infinite loop
dbg("Store response does not contain a cursor, stopping pagination");
return messages;
}
}
Expand Down

0 comments on commit 6781166

Please sign in to comment.