Skip to content
This repository has been archived by the owner on Oct 23, 2022. It is now read-only.

chore: upgrade to libp2p 0.39 #472

Merged
merged 6 commits into from
Aug 18, 2021
Merged

chore: upgrade to libp2p 0.39 #472

merged 6 commits into from
Aug 18, 2021

Conversation

CHr15F0x
Copy link
Contributor

@CHr15F0x CHr15F0x commented Aug 17, 2021

This PR is a follow up of #463.

It includes the following:

  • upgrading libp2p to v.0.39.1
  • upgrading some other deps (e.g.: prost, prost-base, quick-protobuf, base64), excluding cid and multihash
  • fixes to tests that started failing following upgrade to libp2p v.0.38 in chore: upgrade to libp2p 0.38 #463

Incoming shortly:

  • respective changelog update
  • I haven't run the changes against current workflow, so some additional fixes could be necessary; edit: though I did check against all tests locally numerous times during dev, albeit only in a linux/x64 environment; btw looks like the workflows are fine with the changes

Copy link

@mxinden mxinden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unsolicited review. Feel free to ignore :)

bitswap/src/protocol.rs Outdated Show resolved Hide resolved
src/lib.rs Outdated Show resolved Hide resolved
src/p2p/addr.rs Outdated Show resolved Hide resolved
Includes replacing `upgrade::{write_one, read_one}` with `upgrade::{write_length_prefixed, read_length_prefixed}` respectively, which is a direct consequence of [PR2111](libp2p/rust-libp2p#2111).
@koivunej
Copy link
Collaborator

Cancelling the post-rebase run because bors will rerun it.

bors r+

@bors
Copy link
Contributor

bors bot commented Aug 18, 2021

Build succeeded:

@bors bors bot merged commit ede42eb into rs-ipfs:master Aug 18, 2021
@koivunej
Copy link
Collaborator

Thank you @CHr15F0x for going through with this. We mostly had the "review" in chat but we mostly noted the eq_greedy and cleaning up of the whole swarm code in a follow-up.

bors bot added a commit that referenced this pull request Aug 23, 2021
473: Swarm cleanup following libp2p upgrade to v0.39.1 r=koivunej a=CHr15F0x

This is a follow up of #472. There are two changes introduced:
* remove eq_greedy as `Multiaddr` in `SwarmApi::pending_{addresses, connections}` contains p2p, align conversions accordingly (136496f),
* explicitly use `MultiaddrWithPeerId` in `SwarmApi::pending_{addresses, connections}` (3b6f695).

The former (136496f) works fine without the latter (3b6f695), however I am leaning more towards keeping both changes. Encoding the information about peer id presence/absence in Multiaddr in _type_ instead of relying on comments and `expect()`s improves readability and _developer experience_.

Please let me know what your thoughts are.

Co-authored-by: Krzysztof Lis <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants