Consolidation step 1 of 8: the proxy client loses its internal header [androidbuild] [iosbuild]#40
Merged
Merged
Conversation
First step of the module consolidation (owner decision 2026-07-04: consolidate now; linting may be disabled selectively where the known clangd bug produces false errors). Order is consumers-first: a library's headers can only be deleted once no other package's headers still include them, so consolidation walks the dependency chain from the top; the proxy client is the topmost consumer and the smallest. - LibProxyClientApi.hpp (673 lines) merged into streamrproxyclient.cpp, which now imports the four sibling modules (streamr.dht, streamr.logger, streamr.trackerlessnetwork, streamr.utils) instead of textually including their headers. Third-party libraries, the standard library and the public C API header remain textual includes. - streamr_enable_imports(streamrproxyclient) so the implementation is scanned for module dependencies. - StreamrModules.cmake (canonical + synced copies): the Android NDK version floor is now a hard configure-time error instead of a textual fall-back - the fall-back required the internal headers that consolidation deletes. - Two NOLINT(bugprone-exception-escape) suppressions: the checker cannot see through imported module interfaces (known pattern from the import-using test files). - MODERNIZATION.md: the owner decision, the revised order and the C-1 record. Verified: Release build green, proxyclient tests 15/15, standalone package build green (synthesized module compilation in the consumer build dir), package lint green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Bugbot is not enabled for this team, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
The NOT CMAKE_CROSSCOMPILING guard (added when Android modules were enabled) is not enough on iOS: the iOS package builds keep the host CMAKE_SYSTEM_NAME by design (Homebrew compiler, only the SDK/sysroot is swapped), so CMake does not consider them cross-compiling and the host-only protoc plugin was configured against the arm64-ios vcpkg tree, which provides no protobuf::libprotoc. Restore the explicit IOS condition (set by toolchains/ios.toolchain.cmake) alongside the cross-compiling check. First iOS run since that commit caught it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Bugbot is not enabled for this team, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the first step of the module consolidation, which you decided to start immediately (2026-07-04). Consolidation means moving all of the library code out of the internal header files and deleting those header files; only third-party libraries, generated protocol-buffer code and the public C header remain as ordinary includes.
Why the order changed: consumers first, libraries last
The old plan suggested starting with the smallest leaf library. That is impossible: a library's header files can only be deleted once no other package's header files still include them, and during the transition the downstream packages' headers do exactly that. So consolidation walks the dependency chain from the top instead. The full order (one pull request each) is now recorded in MODERNIZATION.md:
What this pull request does
LibProxyClientApi.hpp(673 lines) is merged intostreamrproxyclient.cpp, and the implementation now imports the four sibling modules (streamr.dht,streamr.logger,streamr.trackerlessnetwork,streamr.utils) instead of textually including their headers. The public C headerstreamrproxyclient.h— the permanent public interface — is untouched, so nothing changes for users of the shared library.bugprone-exception-escapechecker, which cannot see through imported module interfaces and therefore wrongly assumes functions may throw (a pattern already known from the test files).About the accepted linting cost
Good news: the code-analysis step passes completely on this package — the consolidated file did not even trigger the known clangd bug, so nothing had to be excluded from checking here. The selective-disabling permission you gave will likely be needed in the later, larger steps.
Verification
🤖 Generated with Claude Code