waku-org
/
js-waku
mirror of https://github.com/waku-org/js-waku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from status-im/remove-protocol-patch

This commit is contained in:
Franck Royer 2021-03-22 22:24:00 +11:00 committed by GitHub
parent 5733fda0ab 01bc19e52c
commit 2e845bc810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/waku_relay.spec.ts
View File

@ -1,5 +1,4 @@
import { expect } from 'chai'; import { expect } from 'chai';
import Libp2p from 'libp2p';
import Pubsub from 'libp2p-interfaces/src/pubsub'; import Pubsub from 'libp2p-interfaces/src/pubsub';
import { NimWaku } from '../test_utils/nim_waku'; import { NimWaku } from '../test_utils/nim_waku';
@ -99,8 +98,6 @@ describe('Waku Relay', () => {
// https://github.com/status-im/nim-waku/issues/422 is fixed // https://github.com/status-im/nim-waku/issues/422 is fixed
waku.libp2p.pubsub.globalSignaturePolicy = 'StrictSign'; waku.libp2p.pubsub.globalSignaturePolicy = 'StrictSign';
await patchPeerStore(nimWaku, waku.libp2p);
await waku.relay.publish(message); await waku.relay.publish(message);
await nimWaku.waitForLog('WakuMessage received'); await nimWaku.waitForLog('WakuMessage received');
@ -118,8 +115,6 @@ describe('Waku Relay', () => {
this.timeout(5000); this.timeout(5000);
const message = Message.fromUtf8String('Here is another message.'); const message = Message.fromUtf8String('Here is another message.');
await patchPeerStore(nimWaku, waku.libp2p);
await waku.relay.subscribe(); await waku.relay.subscribe();
await new Promise((resolve) => await new Promise((resolve) =>
@ -148,19 +143,3 @@ function waitForNextData(pubsub: Pubsub): Promise<Message> {
return Message.fromBinary(msg.data); return Message.fromBinary(msg.data);
}); });
} }
// TODO: Remove this hack, tracked with https://github.com/status-im/nim-waku/issues/419
async function patchPeerStore(nimWaku: NimWaku, node: Libp2p) {
const nimPeerId = await nimWaku.getPeerId();
node.identifyService!.peerStore.protoBook.set(nimPeerId, [CODEC]);
const peer = node.peerStore.peers.get(nimPeerId.toB58String());
if (!peer) {
throw 'Did not find nim-waku node in peers';
}
peer.protocols = [CODEC];
node.peerStore.peers.set(nimPeerId.toB58String(), peer);
await new Promise((resolve) =>
node.pubsub.once('gossipsub:heartbeat', resolve)
);
}

4
tsconfig.json
View File

@ -42,9 +42,9 @@
"lib": ["es2017"], "lib": ["es2017"],
"types": ["node", "mocha"], "types": ["node", "mocha"],
"typeRoots": ["node_modules/@types", "src/types", "src/gen/proto"] "typeRoots": ["node_modules/@types", "src/types"]
}, },
"include": ["src/**/*.ts", "src/**/*.d.ts"], "include": ["src/**/*.ts"],
"exclude": ["node_modules/**"], "exclude": ["node_modules/**"],
"compileOnSave": false, "compileOnSave": false,
"ts-node": { "ts-node": {