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

refactor!: remove 24-host path function in favour of sybling key functions (backport #7016) #7034

Merged
merged 3 commits into from
Aug 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2024

Description

closes: #6882


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

This is an automatic backport of pull request #7016 done by [Mergify](https://mergify.com).

…tions (#7016)

* refactor: remove all Path functions from 24-host in favour of Key functions

* docs: migration + changelog

* Update docs/docs/05-migrations/13-v8-to-v9.md

* lint

(cherry picked from commit f4eba71)

# Conflicts:
#	CHANGELOG.md
#	docs/docs/05-migrations/13-v8-to-v9.md
Copy link
Contributor Author

mergify bot commented Aug 1, 2024

Cherry-pick of f4eba71 has failed:

On branch mergify/bp/release/v9.0.x/pr-7016
Your branch is up to date with 'origin/release/v9.0.x'.

You are currently cherry-picking commit f4eba717.
  (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:
	modified:   modules/core/04-channel/keeper/grpc_query.go
	modified:   modules/core/04-channel/keeper/keeper.go
	modified:   modules/core/24-host/channel_keys.go
	deleted:    modules/core/24-host/channel_paths.go
	modified:   modules/core/24-host/client_keys.go
	deleted:    modules/core/24-host/client_paths.go
	modified:   modules/core/24-host/connection_keys.go
	deleted:    modules/core/24-host/connection_paths.go
	modified:   modules/core/24-host/packet_keys.go
	deleted:    modules/core/24-host/packet_paths.go
	modified:   modules/core/24-host/parse_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   docs/docs/05-migrations/13-v8-to-v9.md

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

@DimitrisJim
Copy link
Contributor

note, took liberty of completely dropping docs folder instead of fixing conflicts there.

Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

Removing docs breaks markdown links, but we shouldn't be linking from the release branch anyways

@colin-axner
Copy link
Contributor

Thanks for picking this up @DimitrisJim !

@DimitrisJim
Copy link
Contributor

Removing docs breaks markdown links, but we shouldn't be linking from the release branch anyways

yup, let me just drop that too. we shouldn't have it in release branches.

Copy link

sonarcloud bot commented Aug 5, 2024

@DimitrisJim DimitrisJim merged commit 98d1edc into release/v9.0.x Aug 5, 2024
24 checks passed
@DimitrisJim DimitrisJim deleted the mergify/bp/release/v9.0.x/pr-7016 branch August 5, 2024 13:05
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.

2 participants