Skip to content

p2p: Remove UPnP functionality (backport #1114) #1126

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

Jump to bottom
Merged
merged 4 commits into from
Jul 17, 2023
Merged

p2p: Remove UPnP functionality (backport #1114) #1126

merged 4 commits into from
Jul 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #1114 done by Mergify.
Cherry-pick of 6b8a773 has failed:

On branch mergify/bp/v0.37.x/pr-1114
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 6b8a77375.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changelog/unreleased/breaking-changes/1113-rm-upnp.md
	modified:   cmd/cometbft/commands/run_node.go
	modified:   cmd/cometbft/main.go
	modified:   config/config.go
	modified:   config/toml.go
	modified:   docs/core/configuration.md
	modified:   docs/core/how-to-read-logs.md
	modified:   spec/p2p/implementation/configuration.md
	modified:   spec/p2p/implementation/types.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: cmd/cometbft/commands/probe_upnp.go
	deleted by them: p2p/upnp/probe.go
	deleted by them: p2p/upnp/upnp.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team as code owners July 14, 2023 17:14
@mergify mergify bot added the conflicts label Jul 14, 2023
@thanethomson
p2p: Remove UPnP functionality (#1114)
4e6aba0 
* Remove UPnP functionality

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Update documentation and specs to reflect UPnP removal

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Add changelog entry

Signed-off-by: Thane Thomson <connect@thanethomson.com>

---------

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 6b8a773)

# Conflicts:
#	cmd/cometbft/commands/probe_upnp.go
#	p2p/upnp/probe.go
#	p2p/upnp/upnp.go
@thanethomson
cmd/p2p: Remove unused UPnP code
d203e50 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson
config: Log warning when upnp config field is detected
4163922 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson force-pushed the mergify/bp/v0.37.x/pr-1114 branch from ebbb882 to 4163922 Compare July 17, 2023 10:21
@thanethomson
Expand on changelog entry for clarification
b46380d 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
cason
cason approved these changes Jul 17, 2023
View reviewed changes
Copy link

@cason cason left a comment

Choose a reason for hiding this comment

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

Legit.

@thanethomson thanethomson merged commit f689a1c into v0.37.x Jul 17, 2023
@thanethomson thanethomson deleted the mergify/bp/v0.37.x/pr-1114 branch July 17, 2023 12:23
@faddat faddat mentioned this pull request Jan 5, 2024
Closed
3 tasks
nivasan1 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
@mergify @nivasan1
p2p: Remove UPnP functionality (backport cometbft#1114) (cometbft#1126)
258f34f
This was referenced Feb 25, 2024
Closed
Closed
@faddat faddat mentioned this pull request Mar 20, 2024
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
2 more reviewers

@thanethomson thanethomson thanethomson approved these changes

@cason cason cason approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thanethomson @cason