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

Reorg tests, add describe sections

This commit is contained in:
Franck Royer 2021-03-19 15:03:31 +11:00
parent 7d595b0c8f
commit 13e941513d
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
2 changed files with 118 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/lib/waku.spec.ts
View File

@ -3,31 +3,35 @@ import { NimWaku } from '../test_utils/nim_waku';
import Waku from './waku'; import Waku from './waku';
import { CODEC } from './waku_relay'; import { CODEC } from './waku_relay';
test('Nim-interop: nim-waku node connects to js node', async () => { describe('Waku', () => {
const waku = await Waku.create(); describe('Interop: Nim', () => {
test('nim connects to js', async () => {
const waku = await Waku.create();
const peerId = waku.libp2p.peerId.toB58String(); const peerId = waku.libp2p.peerId.toB58String();
const localMultiaddr = waku.libp2p.multiaddrs.find((addr) => const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
addr.toString().match(/127\.0\.0\.1/) addr.toString().match(/127\.0\.0\.1/)
); );
const multiAddrWithId = localMultiaddr + '/p2p/' + peerId; const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
const nimWaku = new NimWaku(expect.getState().currentTestName); const nimWaku = new NimWaku(expect.getState().currentTestName);
await nimWaku.start({ staticnode: multiAddrWithId }); await nimWaku.start({ staticnode: multiAddrWithId });
const nimPeers = await nimWaku.peers(); const nimPeers = await nimWaku.peers();
expect(nimPeers).toEqual([ expect(nimPeers).toEqual([
{ {
multiaddr: multiAddrWithId, multiaddr: multiAddrWithId,
protocol: CODEC, protocol: CODEC,
connected: true, connected: true,
}, },
]); ]);
const nimPeerId = await nimWaku.getPeerId(); const nimPeerId = await nimWaku.getPeerId();
const jsPeers = waku.libp2p.peerStore.peers; const jsPeers = waku.libp2p.peerStore.peers;
expect(jsPeers.has(nimPeerId.toB58String())).toBeTruthy(); expect(jsPeers.has(nimPeerId.toB58String())).toBeTruthy();
});
});
}); });

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

@ -8,135 +8,139 @@ import Waku from './waku';
import { Message } from './waku_message'; import { Message } from './waku_message';
import { CODEC, TOPIC } from './waku_relay'; import { CODEC, TOPIC } from './waku_relay';
// TODO: Fix this, see https://github.com/ChainSafe/js-libp2p-gossipsub/issues/151 describe('Waku Relay', () => {
test.skip('Publishes message', async () => { // TODO: Fix this, see https://github.com/ChainSafe/js-libp2p-gossipsub/issues/151
const message = Message.fromUtf8String('Bird bird bird, bird is the word!'); test.skip('Publish', async () => {
const message = Message.fromUtf8String('Bird bird bird, bird is the word!');
const [waku1, waku2] = await Promise.all([Waku.create(), Waku.create()]); const [waku1, waku2] = await Promise.all([Waku.create(), Waku.create()]);
// Add node's 2 data to the PeerStore // Add node's 2 data to the PeerStore
waku1.libp2p.peerStore.addressBook.set( waku1.libp2p.peerStore.addressBook.set(
waku2.libp2p.peerId, waku2.libp2p.peerId,
waku2.libp2p.multiaddrs waku2.libp2p.multiaddrs
); );
await waku1.libp2p.dial(waku2.libp2p.peerId); await waku1.libp2p.dial(waku2.libp2p.peerId);
await waku2.relay.subscribe(); await waku2.relay.subscribe();
await new Promise((resolve) => await new Promise((resolve) =>
waku2.libp2p.pubsub.once('pubsub:subscription-change', (...args) => waku2.libp2p.pubsub.once('pubsub:subscription-change', (...args) =>
resolve(args) resolve(args)
) )
); );
// Setup the promise before publishing to ensure the event is not missed // Setup the promise before publishing to ensure the event is not missed
const promise = waitForNextData(waku1.libp2p.pubsub); const promise = waitForNextData(waku1.libp2p.pubsub);
await waku2.relay.publish(message); await waku2.relay.publish(message);
const node1Received = await promise; const node1Received = await promise;
expect(node1Received.isEqualTo(message)).toBeTruthy(); expect(node1Received.isEqualTo(message)).toBeTruthy();
}); });
test('Registers waku relay protocol', async () => { test('Registers waku relay protocol', async () => {
const waku = await Waku.create(); const waku = await Waku.create();
const protocols = Array.from(waku.libp2p.upgrader.protocols.keys()); const protocols = Array.from(waku.libp2p.upgrader.protocols.keys());
expect(protocols.findIndex((value) => value == CODEC)).toBeTruthy(); expect(protocols.findIndex((value) => value == CODEC)).toBeTruthy();
}); });
test('Does not register any sub protocol', async () => { test('Does not register any sub protocol', async () => {
const waku = await Waku.create(); const waku = await Waku.create();
const protocols = Array.from(waku.libp2p.upgrader.protocols.keys()); const protocols = Array.from(waku.libp2p.upgrader.protocols.keys());
expect(protocols.findIndex((value) => value.match(/sub/))).toBeTruthy(); expect(protocols.findIndex((value) => value.match(/sub/))).toBeTruthy();
}); });
test('Nim-interop: js node receives default subscription from nim node', async () => { describe('Interop: Nim', () => {
const waku = await Waku.create(); test('nim subscribes to js', async () => {
const waku = await Waku.create();
const peerId = waku.libp2p.peerId.toB58String(); const peerId = waku.libp2p.peerId.toB58String();
const localMultiaddr = waku.libp2p.multiaddrs.find((addr) => const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
addr.toString().match(/127\.0\.0\.1/) addr.toString().match(/127\.0\.0\.1/)
); );
const multiAddrWithId = localMultiaddr + '/p2p/' + peerId; const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
const nimWaku = new NimWaku(expect.getState().currentTestName); const nimWaku = new NimWaku(expect.getState().currentTestName);
await nimWaku.start({ staticnode: multiAddrWithId }); await nimWaku.start({ staticnode: multiAddrWithId });
const nimPeerId = await nimWaku.getPeerId(); const nimPeerId = await nimWaku.getPeerId();
const subscribers = waku.libp2p.pubsub.getSubscribers(TOPIC); const subscribers = waku.libp2p.pubsub.getSubscribers(TOPIC);
expect(subscribers).toContain(nimPeerId.toB58String()); expect(subscribers).toContain(nimPeerId.toB58String());
}); });
test('Nim-interop: js node sends message to nim node', async () => { test('Js publishes to nim', async () => {
const message = Message.fromUtf8String('This is a message'); const message = Message.fromUtf8String('This is a message');
const waku = await Waku.create(); const waku = await Waku.create();
// TODO: nim-waku does follow the `StrictNoSign` policy hence we need to change // TODO: nim-waku does follow the `StrictNoSign` policy hence we need to change
// it for nim-waku to process our messages. Can be removed once // it for nim-waku to process our messages. Can be removed once
// 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';
const peerId = waku.libp2p.peerId.toB58String(); const peerId = waku.libp2p.peerId.toB58String();
const localMultiaddr = waku.libp2p.multiaddrs.find((addr) => const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
addr.toString().match(/127\.0\.0\.1/) addr.toString().match(/127\.0\.0\.1/)
); );
const multiAddrWithId = localMultiaddr + '/p2p/' + peerId; const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
const nimWaku = new NimWaku(expect.getState().currentTestName); const nimWaku = new NimWaku(expect.getState().currentTestName);
await nimWaku.start({ staticnode: multiAddrWithId }); await nimWaku.start({ staticnode: multiAddrWithId });
await patchPeerStore(nimWaku, waku.libp2p); 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');
const msgs = await nimWaku.messages(); const msgs = await nimWaku.messages();
expect(msgs[0].contentTopic).toEqual(message.contentTopic); expect(msgs[0].contentTopic).toEqual(message.contentTopic);
expect(msgs[0].version).toEqual(message.version); expect(msgs[0].version).toEqual(message.version);
const payload = Buffer.from(msgs[0].payload); const payload = Buffer.from(msgs[0].payload);
expect(Buffer.compare(payload, message.payload)).toBe(0); expect(Buffer.compare(payload, message.payload)).toBe(0);
}); });
test('Nim-interop: nim node sends message to js node', async () => { test('Nim publishes to js', async () => {
const message = Message.fromUtf8String('Here is another message.'); const message = Message.fromUtf8String('Here is another message.');
const waku = await Waku.create(); const waku = await Waku.create();
const peerId = waku.libp2p.peerId.toB58String(); const peerId = waku.libp2p.peerId.toB58String();
const localMultiaddr = waku.libp2p.multiaddrs.find((addr) => const localMultiaddr = waku.libp2p.multiaddrs.find((addr) =>
addr.toString().match(/127\.0\.0\.1/) addr.toString().match(/127\.0\.0\.1/)
); );
const multiAddrWithId = localMultiaddr + '/p2p/' + peerId; const multiAddrWithId = localMultiaddr + '/p2p/' + peerId;
const nimWaku = new NimWaku(expect.getState().currentTestName); const nimWaku = new NimWaku(expect.getState().currentTestName);
await nimWaku.start({ staticnode: multiAddrWithId }); await nimWaku.start({ staticnode: multiAddrWithId });
await patchPeerStore(nimWaku, waku.libp2p); await patchPeerStore(nimWaku, waku.libp2p);
await waku.relay.subscribe(); await waku.relay.subscribe();
await new Promise((resolve) => await new Promise((resolve) =>
waku.libp2p.pubsub.once('gossipsub:heartbeat', resolve) waku.libp2p.pubsub.once('gossipsub:heartbeat', resolve)
); );
const receivedPromise = waitForNextData(waku.libp2p.pubsub); const receivedPromise = waitForNextData(waku.libp2p.pubsub);
await nimWaku.sendMessage(message); await nimWaku.sendMessage(message);
const receivedMsg = await receivedPromise; const receivedMsg = await receivedPromise;
expect(receivedMsg.contentTopic).toBe(message.contentTopic); expect(receivedMsg.contentTopic).toBe(message.contentTopic);
expect(receivedMsg.version).toBe(message.version); expect(receivedMsg.version).toBe(message.version);
const payload = Buffer.from(receivedMsg.payload); const payload = Buffer.from(receivedMsg.payload);
expect(Buffer.compare(payload, message.payload)).toBe(0); expect(Buffer.compare(payload, message.payload)).toBe(0);
});
});
}); });
function waitForNextData(pubsub: Pubsub): Promise<Message> { function waitForNextData(pubsub: Pubsub): Promise<Message> {