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

Merge #28 

28: Upgrade to latest nim-waku master commit r=D4nte a=D4nte



Co-authored-by: Franck Royer <franck@royer.one>
This commit is contained in:
bors[bot] 2021-04-13 00:57:01 +00:00 committed by GitHub
parent 29a3ec403c ef409bd89b
commit 2b1862320f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nim-waku

@ -1 +1 @@
Subproject commit 5d138f8a2c3f18703cfe6f7497e5d3fba074cdf2 Subproject commit 286482ea32401952ff01b80ad7cc183cb9336c06

20
proto/waku/v2/store.proto
View File

@ -9,33 +9,27 @@ message Index {
double received_time = 2; double received_time = 2;
} }
message PagingInfoQuery {
uint32 page_size = 1; // TODO: See https://github.com/vacp2p/rfc/issues/326
Index cursor = 2;
Direction direction = 3;
}
enum Direction { enum Direction {
DIRECTION_BACKWARD_UNSPECIFIED = 0; DIRECTION_BACKWARD_UNSPECIFIED = 0;
DIRECTION_FORWARD = 1; DIRECTION_FORWARD = 1;
} }
message PagingInfoResponse { message PagingInfo {
uint64 page_size = 1; // TODO: See https://github.com/vacp2p/rfc/issues/326 uint64 page_size = 1;
Index cursor = 2; Index cursor = 2;
Direction direction = 3; Direction direction = 3;
} }
message HistoryQuery { message HistoryQuery {
repeated string topics = 1; repeated string topics = 2;
optional PagingInfoQuery paging_info = 2; optional PagingInfo paging_info = 3;
optional double start_time = 3; optional double start_time = 4;
optional double end_time = 4; optional double end_time = 5;
} }
message HistoryResponse { message HistoryResponse {
repeated WakuMessageProto messages = 1; repeated WakuMessageProto messages = 1;
PagingInfoResponse paging_info = 2; PagingInfo paging_info = 2;
} }
message HistoryRPC { message HistoryRPC {

14
src/lib/waku_relay/index.spec.ts
View File

@ -133,9 +133,12 @@ describe('Waku Relay', () => {
await waku.relay.publish(message); await waku.relay.publish(message);
await nimWaku.waitForLog('WakuMessage received'); let msgs = [];
const msgs = await nimWaku.messages(); while (msgs.length === 0) {
await delay(200);
msgs = await nimWaku.messages();
}
expect(msgs[0].contentTopic).to.equal(message.contentTopic); expect(msgs[0].contentTopic).to.equal(message.contentTopic);
expect(msgs[0].version).to.equal(message.version); expect(msgs[0].version).to.equal(message.version);
@ -206,9 +209,12 @@ describe('Waku Relay', () => {
await waku.relay.publish(message); await waku.relay.publish(message);
await nimWaku.waitForLog('WakuMessage received'); let msgs = [];
const msgs = await nimWaku.messages(); while (msgs.length === 0) {
await delay(200);
msgs = await nimWaku.messages();
}
expect(msgs[0].contentTopic).to.equal(message.contentTopic); expect(msgs[0].contentTopic).to.equal(message.contentTopic);
expect(msgs[0].version).to.equal(message.version); expect(msgs[0].version).to.equal(message.version);

3
src/lib/waku_store/index.spec.ts
View File

@ -59,8 +59,7 @@ describe('Waku Store', () => {
const response = await waku.store.queryHistory(nimPeerId); const response = await waku.store.queryHistory(nimPeerId);
const messages = response?.messages; const messages = response?.messages;
// TODO: Should be fixed with https://github.com/status-im/nim-waku/issues/471 expect(messages?.length).eq(2);
// expect(messages?.length).eq(2);
const result = messages const result = messages
?.map((protoMsg) => { ?.map((protoMsg) => {
return WakuMessage.fromProto(protoMsg); return WakuMessage.fromProto(protoMsg);