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.

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

Merge inject_* paired methods #2445

Merged
merged 16 commits into from
Feb 9, 2022
Merged

Conversation

divagant-martian
Copy link
Contributor

@divagant-martian divagant-martian commented Jan 20, 2022

Addresses #2434

  • Include the number of other reported connections in inject_connection_established
  • remove inject_connected
  • Include the number of remaining reported open connections in inject_connection_closed
  • remove inject_disconnected

I'll leave the changelogs for later to avoid cluttering the diff for review.
In an attempt to not interfere with the logic of the protocols I left (for now) a TODO note in the autonat behaviour regarding a mapping that seems to never be cleared

@divagant-martian divagant-martian marked this pull request as ready for review January 21, 2022 19:22
Copy link
Member

@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.

Thanks for looking into this! 🙏

protocols/gossipsub/src/behaviour/tests.rs Outdated Show resolved Hide resolved
protocols/relay/src/v2/relay.rs Outdated Show resolved Hide resolved
@elenaf9
Copy link
Contributor

elenaf9 commented Jan 31, 2022

In an attempt to not interfere with the logic of the protocols I left (for now) a TODO note in the autonat behaviour regarding a mapping that seems to never be cleared.

@divagant-martian Could you please point out to me what line/ mapping in the autonat behaviour you are referring to?

@mxinden
Copy link
Member

mxinden commented Jan 31, 2022

In an attempt to not interfere with the logic of the protocols I left (for now) a TODO note in the autonat behaviour regarding a mapping that seems to never be cleared.

@divagant-martian Could you please point out to me what line/ mapping in the autonat behaviour you are referring to?

I think @divagant-martian mixed up libp2p-autonat and libp2p-relay. I think the comment refers to #2445 (comment).

Copy link
Member

@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.

I'll leave the changelogs for later to avoid cluttering the diff for review.

Looks good to me overall apart from changelog entries and version bumps. Given the recent release (v0.42.0 and v0.42.1) let me know if you need help with the various semver version updates.

protocols/relay/src/v2/relay.rs Outdated Show resolved Hide resolved
@divagant-martian
Copy link
Contributor Author

Hey @mxinden can you share your upgrade version tools?

@mxinden
Copy link
Member

mxinden commented Feb 7, 2022

Hey @mxinden can you share your upgrade version tools?

Version upgrades have been done via #2469, thus only the normal changelog entries are needed here.

(The version tool is a VERY hacky Python script written by a total Python novice (me). I am not sure it is yet ready to be seen by other human beings :D )

@divagant-martian
Copy link
Contributor Author

Grand, I'll add the Changelog entries!

@mxinden
Copy link
Member

mxinden commented Feb 9, 2022

Thanks. Can you add an entry for swarm/CHANGELOG.md as well?

@divagant-martian
Copy link
Contributor Author

done! Ty @mxinden

@mxinden
Copy link
Member

mxinden commented Feb 9, 2022

Merge needs to incorporate #2076 which is still using the old methods. Could you incorporate that @divagant-martian? Sorry for the trouble.

@divagant-martian
Copy link
Contributor Author

@mxinden dcutr does not have a CHANGELOG, how would it look like for a first time?

@mxinden
Copy link
Member

mxinden commented Feb 9, 2022

Oh, my bad. I am not a good rust-libp2p citizen. No need to add an entry for libp2p-dcutr here, given that it has never been released. I will add a changelog in a separate pull request. Thanks for raising it.

Copy link
Member

@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.

Thanks for the clean up!

@mxinden mxinden merged commit dc8433e into libp2p:master Feb 9, 2022
@AgeManning AgeManning deleted the merge-inject-methods branch November 29, 2023 05:11
umgefahren pushed a commit to umgefahren/rust-libp2p that referenced this pull request Mar 8, 2024
Co-authored-by: Max Inden <mail@max-inden.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants