diff --git a/test/.mocharc.json b/test/.mocharc.json index 40a710d..6dca9d7 100644 --- a/test/.mocharc.json +++ b/test/.mocharc.json @@ -5,5 +5,5 @@ "exit": true, "bail": false, "slow": 1000, - "exclude": ["test/browser/**/*.js"] + "exclude": ["test/browser/**/*.js", "test/utils/relay.js"] } \ No newline at end of file diff --git a/test/utils/connect-nodes.js b/test/utils/connect-nodes.js index 96dbe6e..7c671fd 100644 --- a/test/utils/connect-nodes.js +++ b/test/utils/connect-nodes.js @@ -6,16 +6,17 @@ const isBrowser = () => typeof window !== 'undefined' const connectIpfsNodes = async (ipfs1, ipfs2, options = { filter: defaultFilter -}) => { +}) => { if (isBrowser()) { ipfs1.libp2p.addEventListener('self:peer:update', async (event) => { if (ipfs1.libp2p.getMultiaddrs().length > 0) { await ipfs2.libp2p.peerStore.save(ipfs1.libp2p.peerId, { multiaddrs: ipfs1.libp2p.getMultiaddrs().filter(options.filter) }) await ipfs2.libp2p.dial(ipfs1.libp2p.peerId) + await ipfs1.libp2p.hangUp(multiaddr('/ip4/127.0.0.1/tcp/12345/ws/p2p/QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A')) } }) - - await ipfs1.libp2p.dial(multiaddr('/ip4/127.0.0.1/tcp/12345/ws/p2p/16Uiu2HAkuzR9BJ2JHXxzanXUdP5ixbCPduFst2FNWsBsarGfgU1y')) + + await ipfs1.libp2p.dial(multiaddr('/ip4/127.0.0.1/tcp/12345/ws/p2p/QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A')) } else { await ipfs2.libp2p.peerStore.save(ipfs1.libp2p.peerId, { multiaddrs: ipfs1.libp2p.getMultiaddrs().filter(options.filter) }) await ipfs2.libp2p.dial(ipfs1.libp2p.peerId) diff --git a/test/utils/relay.js b/test/utils/relay.js index 2459877..740d7ad 100644 --- a/test/utils/relay.js +++ b/test/utils/relay.js @@ -5,14 +5,14 @@ import { circuitRelayServer } from 'libp2p/circuit-relay' import { webSockets } from '@libp2p/websockets' import * as filters from '@libp2p/websockets/filters' import { identifyService } from 'libp2p/identify' -import testKeysPath from '../fixtures/test-keys-path.js' -import { KeyStore } from '../../src/index.js' +import relayPrivKey from '../fixtures/keys/relay.js' import { createFromPrivKey } from '@libp2p/peer-id-factory' -import * as crypto from '@libp2p/crypto' +import { unmarshalPrivateKey } from '@libp2p/crypto/keys' +import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string' -const keystore = await KeyStore({ path: testKeysPath }) -const keys = await keystore.getKey('userX') -const peerId = await createFromPrivKey(keys) +const encoded = uint8ArrayFromString(relayPrivKey, 'base64pad') +const privateKey = await unmarshalPrivateKey(encoded) +const peerId = await createFromPrivKey(privateKey) const server = await createLibp2p({ peerId, @@ -32,6 +32,10 @@ const server = await createLibp2p({ } }) +server.addEventListener('peer:connect', async event => { + console.log('peer:connect', event.detail) +}) + server.addEventListener('peer:disconnect', async event => { console.log('peer:disconnect', event.detail) server.peerStore.delete(event.detail)