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

Move some files closer to where they should live. #18465

Merged
merged 3 commits into from
Oct 17, 2024

Conversation

richardkiss
Copy link
Contributor

@richardkiss richardkiss commented Aug 13, 2024

FIXED: move two files and factor out IPAddress

Purpose:

Remove a few import cycles.

Current Behavior:

New Behavior:

Testing Notes:

@richardkiss richardkiss requested a review from a team as a code owner August 13, 2024 21:30
@richardkiss richardkiss marked this pull request as draft August 13, 2024 21:30
@github-actions github-actions bot added the stale-pr Flagged as stale and in need of manual review label Sep 28, 2024
@richardkiss richardkiss force-pushed the rearrange branch 5 times, most recently from eeacd45 to 085e772 Compare October 9, 2024 00:36
@github-actions github-actions bot removed the stale-pr Flagged as stale and in need of manual review label Oct 9, 2024
@richardkiss richardkiss force-pushed the rearrange branch 3 times, most recently from 647caa1 to 5815577 Compare October 15, 2024 21:18
@Chia-Network Chia-Network deleted a comment from github-actions bot Oct 15, 2024
@richardkiss
Copy link
Contributor Author

This PR is best reviewed one change at a time.

This PR moves two files (the first two changes), and pulls out the IPAddress data type to remove a subtle cyclic dependency.

@richardkiss richardkiss marked this pull request as ready for review October 15, 2024 21:22
arvidn
arvidn previously approved these changes Oct 16, 2024
Copy link
Contributor

@arvidn arvidn left a comment

Choose a reason for hiding this comment

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

looks good. There are some questionable formatting changes though (and pre-commit is complaining)

chia/util/network.py Outdated Show resolved Hide resolved
Copy link
Contributor

@AmineKhaldi AmineKhaldi left a comment

Choose a reason for hiding this comment

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

Thanks. I've sent some suggestions that when (batch) applied, would make CI green.

chia/util/network.py Outdated Show resolved Hide resolved
chia/util/network.py Outdated Show resolved Hide resolved
chia/util/network.py Outdated Show resolved Hide resolved
chia/util/network.py Outdated Show resolved Hide resolved
chia/util/network.py Outdated Show resolved Hide resolved
chia/util/network.py Outdated Show resolved Hide resolved
@richardkiss richardkiss added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Oct 16, 2024
Copy link

coveralls-official bot commented Oct 16, 2024

Pull Request Test Coverage Report for Build 11373736330

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 38 of 38 (100.0%) changed or added relevant lines in 8 files are covered.
  • 14 unchanged lines in 9 files lost coverage.
  • Overall coverage increased (+0.04%) to 91.029%

Files with Coverage Reduction New Missed Lines %
chia/server/address_manager.py 1 90.31%
chia/full_node/pending_tx_cache.py 1 96.63%
chia/rpc/rpc_server.py 1 88.82%
chia/wallet/util/wallet_sync_utils.py 1 86.54%
chia/plotters/madmax.py 1 50.6%
chia/full_node/full_node.py 1 86.44%
chia/daemon/server.py 1 83.25%
chia/server/node_discovery.py 3 80.35%
chia/wallet/wallet_node.py 4 88.79%
Totals Coverage Status
Change from base Build 11371606365: 0.04%
Covered Lines: 102581
Relevant Lines: 112670

💛 - Coveralls

@richardkiss richardkiss force-pushed the rearrange branch 2 times, most recently from b311119 to 0392475 Compare October 16, 2024 20:57
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Oct 16, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Oct 16, 2024
@pmaslana pmaslana merged commit f69233a into Chia-Network:main Oct 17, 2024
354 of 355 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants