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

Update libp2p, tokio, warp, prost, futures, etc #446

Merged
merged 24 commits into from
Jan 26, 2021
Merged

Update libp2p, tokio, warp, prost, futures, etc #446

merged 24 commits into from
Jan 26, 2021

Conversation

koivunej
Copy link
Collaborator

@koivunej koivunej commented Jan 12, 2021 •
edited
Loading

Rebased the #431 work on top of the latest master. This PR will leave:

  • mdns commented out
  • domain a git dependency pending a release or migration to trust-dns following upcoming changes in libp2p-dns

This was referenced Jan 12, 2021
Closed
Open
Merged
Closed
ljedrz added 3 commits January 18, 2021 16:56
@ljedrz @koivunej
chore: update libp2p to 0.30
c0657bf 
Signed-off-by: ljedrz <ljedrz@gmail.com>
@ljedrz @koivunej
chore: update tokio to 0.3
7e51079 
Signed-off-by: ljedrz <ljedrz@gmail.com>
@ljedrz @koivunej
chore: post-update tweaks
bc03794 
Signed-off-by: ljedrz <ljedrz@gmail.com>
@koivunej koivunej force-pushed the ljedrz-update_libp2p_and_tokio2 branch from 4a5ac67 to e9e6d55 Compare January 18, 2021 15:00
@koivunej
Copy link
Collaborator Author

Rebased on top of the latest master (minor CHANGELOG.md conflict, fixed some messed up links :))

@koivunej
Copy link
Collaborator Author

koivunej commented Jan 18, 2021 •
edited
Loading

Still left to do:

  • checking of the cargo tree for extra deps, duplicate deps

@koivunej koivunej changed the title Update libp2p and tokio Update libp2p, tokio, warp, prost, futures, etc Jan 18, 2021
@koivunej koivunej force-pushed the ljedrz-update_libp2p_and_tokio2 branch from d03ca1b to 5b042a6 Compare January 20, 2021 09:13
@koivunej
Copy link
Collaborator Author

I had missed a rust-libp2p release 0.34, so that can be checked off. Thinking off doing some commit squashing and them merging. The windows test failure seemed transient.

koivunej added 17 commits January 25, 2021 11:40
@koivunej
chore(deps): tokio 1.0
5b55ded
@koivunej
chore: add changelog note
7bb3aaa
@koivunej
chore(deps): latest domain
5cbe44c
@koivunej
chore: upgrade bytes, add bytes feature for domain
b7ab9b7
@koivunej
chore(deps): latest warp
66c360c
@koivunej
chore: most of the libp2p updating, comment out mdns
2e0b436 
not a nice thing to do but there remains an issue with the dependencies,
and the libp2p tokio-mdns feature is gone. there are also some conflicts
remaining.
@koivunej
fix: minor whitespace and refactoring
cadc909
@koivunej
feat: expose libp2p::multiaddr::multiaddr in ipfs
6de437c 
quite unfortunate that we need to add more of re-exports as we've been
hoping to cut them down.
@koivunej
chore: latest lockfile after all of the changes
307e80b
@koivunej
chore: clippy
ffd043c
@koivunej
chore(deps): prost 0.7
a162ad0
@koivunej
fix(deps): rand is used in only tests directly
e6af4d3
@koivunej
chore(deps): rand 0.8
b8ea76c
@koivunej
fix(deps): tempfile only needed for tests
de7f312
@koivunej
chore(deps): warp 0.3
0e06e51
@koivunej
chore(deps): mpart-async 0.5
e68d134
@koivunej
chore(deps): libp2p 0.34, core+swarm 0.27
2031708
@koivunej koivunej force-pushed the ljedrz-update_libp2p_and_tokio2 branch from 686a917 to 2031708 Compare January 25, 2021 09:49
@koivunej koivunej marked this pull request as ready for review January 25, 2021 09:58
@koivunej
Copy link
Collaborator Author

Must be better to merge this and keep awaiting for a domain release and/or consider trust-dns once libp2p starts to using it as well.

@koivunej koivunej requested a review from ljedrz January 25, 2021 10:57
ljedrz
ljedrz reviewed Jan 25, 2021
View reviewed changes
ljedrz
ljedrz approved these changes Jan 25, 2021
View reviewed changes
Copy link
Member

@ljedrz ljedrz left a comment

Choose a reason for hiding this comment

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

Must have been a challenge to get all those deps aligned!

LGTM 👍

@koivunej
Copy link
Collaborator Author

We stopped to discuss cargo test --test block_exchange -- --ignored long_get_block which became ignored following probably some libp2p change.

In current master with libp2p-kad 0.23 the test works however with libp2p-kad 0.25 it stopped working. I think I'll merge this regardless so that I can get to making smaller PRs to fix the issue.

@koivunej
Copy link
Collaborator Author

bors r+

This was referenced Jan 26, 2021
Open
Open
@bors
Copy link
Contributor

bors bot commented Jan 26, 2021

Build succeeded:

@bors bors bot merged commit a89b0c9 into rs-ipfs:master Jan 26, 2021
@koivunej koivunej mentioned this pull request Jan 27, 2021
Merged
Mirko-von-Leipzig added a commit to Mirko-von-Leipzig/rust-ipfs that referenced this pull request Aug 30, 2021
@Mirko-von-Leipzig
feat: (re)enable mdns
8d0b28e 
This was disabled in PR rs-ipfs#446, due to libp2p removing tokio support for
it. The support has since been added back so this should work again.

rs-ipfs#446
@Mirko-von-Leipzig Mirko-von-Leipzig mentioned this pull request Aug 30, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ljedrz ljedrz ljedrz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@koivunej @ljedrz