Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update pubsub interface to run subsystem tests #148

Merged
merged 3 commits into from
May 28, 2021
Merged

chore: update pubsub interface to run subsystem tests #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
116f691
chore: update pubsub interface to run integration tests
vasco-santos Jan 21, 2021
bc12a84
chore: use npm to allow the usage of npm prepare script
vasco-santos Jan 21, 2021
ee2d5ae
chore: update all deps
vasco-santos May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@
"homepage": "https://github.com/ChainSafe/js-libp2p-gossipsub#readme",
"dependencies": {
"@types/debug": "^4.1.5",
"debug": "^4.1.1",
"denque": "^1.4.1",
"err-code": "^2.0.0",
"it-pipe": "^1.0.1",
"libp2p-interfaces": "^0.10.0",
"peer-id": "^0.14.0",
"protobufjs": "^6.10.2",
"debug": "^4.3.1",
"denque": "^1.5.0",
"err-code": "^3.0.1",
"it-pipe": "^1.1.0",
"libp2p-interfaces": "^0.11.0",
"peer-id": "^0.14.8",
"protobufjs": "^6.11.2",
"time-cache": "^0.3.0",
"uint8arrays": "^2.1.4"
"uint8arrays": "^2.1.5"
},
"devDependencies": {
"@types/chai": "^4.2.3",
"@types/mocha": "^8.2.2",
"@typescript-eslint/eslint-plugin": "^3.0.2",
"@typescript-eslint/parser": "^3.0.2",
"aegir": "^33.0.0",
"aegir": "^33.2.0",
"benchmark": "^2.1.4",
"buffer": "^6.0.3",
"chai": "^4.2.0",
"chai-spies": "^1.0.0",
"delay": "^5.0.0",
"detect-node": "^2.0.4",
"detect-node": "^2.1.0",
"dirty-chai": "^2.0.1",
"eslint": "^7.1.0",
"eslint-config-standard": "^14.1.1",
Expand All @@ -70,9 +70,9 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"it-pair": "^1.0.0",
"libp2p": "^0.31.0",
"libp2p-floodsub": "^0.25.0",
"libp2p-mplex": "^0.10.0",
"libp2p": "^0.31.6",
"libp2p-floodsub": "^0.25.1",
"libp2p-mplex": "^0.10.3",
"libp2p-noise": "^2.0.0",
"libp2p-websockets": "^0.15.5",
"lodash": "^4.17.15",
Expand All @@ -82,7 +82,7 @@
"p-times": "^2.1.0",
"p-wait-for": "^3.1.0",
"promisify-es6": "^1.0.3",
"sinon": "^10.0.1",
"sinon": "^11.1.1",
"typescript": "4.0.x",
"util": "^0.12.3"
},
Expand Down
6 changes: 3 additions & 3 deletions test/go-gossipsub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {

// verify that the direct peers connected
await delay(2000)
expect(libp2ps[1].connectionManager.get(libp2ps[2].peerId)).to.be.truthy
expect(libp2ps[1].connectionManager.get(libp2ps[2].peerId)).to.exist()

const topic = 'foobar'
psubs.forEach(ps => ps.subscribe(topic))
Expand All @@ -884,7 +884,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {

await Promise.all(psubs.map(ps => awaitEvents(ps, 'gossipsub:heartbeat', 5)))

expect(libp2ps[1].connectionManager.get(libp2ps[2].peerId)).to.be.truthy
expect(libp2ps[1].connectionManager.get(libp2ps[2].peerId)).to.exist()

sendRecv = []
for (let i = 0; i < 3; i++) {
Expand Down Expand Up @@ -1067,7 +1067,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
],
})

expect(rpc.control).to.be.truthy
expect(rpc.control).to.exist()
expect(rpc.control.graft.length).to.be.eql(1)
expect(rpc.control.graft[0].topicID).to.be.eql(test1)
expect(rpc.control.prune.length).to.be.eql(2)
Expand Down
68 changes: 55 additions & 13 deletions ts/message/rpc.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export class RPC implements IRPC {
/** RPC control. */
public control?: (RPC.IControlMessage|null);

/** RPC _control. */
public _control?: "control";

/**
* Encodes the specified RPC message. Does not implicitly {@link RPC.verify|verify} messages.
* @param m RPC message or plain object to encode
Expand Down Expand Up @@ -92,10 +95,16 @@ export namespace RPC {
constructor(p?: RPC.ISubOpts);

/** SubOpts subscribe. */
public subscribe: boolean;
public subscribe?: (boolean|null);

/** SubOpts topicID. */
public topicID: string;
public topicID?: (string|null);

/** SubOpts _subscribe. */
public _subscribe?: "subscribe";

/** SubOpts _topicID. */
public _topicID?: "topicID";

/**
* Encodes the specified SubOpts message. Does not implicitly {@link RPC.SubOpts.verify|verify} messages.
Expand Down Expand Up @@ -169,22 +178,37 @@ export namespace RPC {
constructor(p?: RPC.IMessage);

/** Message from. */
public from: Uint8Array;
public from?: (Uint8Array|null);

/** Message data. */
public data: Uint8Array;
public data?: (Uint8Array|null);

/** Message seqno. */
public seqno: Uint8Array;
public seqno?: (Uint8Array|null);

/** Message topicIDs. */
public topicIDs: string[];

/** Message signature. */
public signature: Uint8Array;
public signature?: (Uint8Array|null);

/** Message key. */
public key: Uint8Array;
public key?: (Uint8Array|null);

/** Message _from. */
public _from?: "from";

/** Message _data. */
public _data?: "data";

/** Message _seqno. */
public _seqno?: "seqno";

/** Message _signature. */
public _signature?: "signature";

/** Message _key. */
public _key?: "key";

/**
* Encodes the specified Message message. Does not implicitly {@link RPC.Message.verify|verify} messages.
Expand Down Expand Up @@ -323,11 +347,14 @@ export namespace RPC {
constructor(p?: RPC.IControlIHave);

/** ControlIHave topicID. */
public topicID: string;
public topicID?: (string|null);

/** ControlIHave messageIDs. */
public messageIDs: Uint8Array[];

/** ControlIHave _topicID. */
public _topicID?: "topicID";

/**
* Encodes the specified ControlIHave message. Does not implicitly {@link RPC.ControlIHave.verify|verify} messages.
* @param m ControlIHave message or plain object to encode
Expand Down Expand Up @@ -444,7 +471,10 @@ export namespace RPC {
constructor(p?: RPC.IControlGraft);

/** ControlGraft topicID. */
public topicID: string;
public topicID?: (string|null);

/** ControlGraft _topicID. */
public _topicID?: "topicID";

/**
* Encodes the specified ControlGraft message. Does not implicitly {@link RPC.ControlGraft.verify|verify} messages.
Expand Down Expand Up @@ -509,13 +539,19 @@ export namespace RPC {
constructor(p?: RPC.IControlPrune);

/** ControlPrune topicID. */
public topicID: string;
public topicID?: (string|null);

/** ControlPrune peers. */
public peers: RPC.IPeerInfo[];

/** ControlPrune backoff. */
public backoff: number;
public backoff?: (number|null);

/** ControlPrune _topicID. */
public _topicID?: "topicID";

/** ControlPrune _backoff. */
public _backoff?: "backoff";

/**
* Encodes the specified ControlPrune message. Does not implicitly {@link RPC.ControlPrune.verify|verify} messages.
Expand Down Expand Up @@ -577,10 +613,16 @@ export namespace RPC {
constructor(p?: RPC.IPeerInfo);

/** PeerInfo peerID. */
public peerID: Uint8Array;
public peerID?: (Uint8Array|null);

/** PeerInfo signedPeerRecord. */
public signedPeerRecord: Uint8Array;
public signedPeerRecord?: (Uint8Array|null);

/** PeerInfo _peerID. */
public _peerID?: "peerID";

/** PeerInfo _signedPeerRecord. */
public _signedPeerRecord?: "signedPeerRecord";

/**
* Encodes the specified PeerInfo message. Does not implicitly {@link RPC.PeerInfo.verify|verify} messages.
Expand Down
Loading