Move IPFS pinning related code behind local node build flag #16866
Conversation
This file contains 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
yrliou
reviewed
Jan 25, 2023
| @@ -47,13 +48,15 @@ class IPFSJSONParser { | |||
| static std::string RemovePeerFromConfigJSON(const std::string& json, | |||
| const std::string& peer_id, | |||
| const std::string& address); | |||
| #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) | |||
| // Local pins | |||
| static absl::optional<ipfs::AddPinResult> GetAddPinsResultFromJSON( | |||
There was a problem hiding this comment.
We should probably guard header includes for these *PinResult structs too.
There was a problem hiding this comment.
We probably want to take it even further then, right? There are instances of including ipfs_local_pin_service for instance in the brave_wallet component
There was a problem hiding this comment.
Yes, for any headers that's only built when ENABLE_IPFS_LOCAL_NODE is true should be guarded with it. cc @cypt4
There was a problem hiding this comment.
Added guards to headers and moved the pin service in wallet to be behind buildflag
yrliou
reviewed
Jan 25, 2023
| @@ -968,6 +968,7 @@ void IpfsService::OnPreWarmComplete( | |||
| std::move(prewarm_callback_for_testing_).Run(); | |||
| } | |||
|
|
|||
| #if BUILDFLAG(ENABLE_IPFS_LOCAL_NODE) | |||
There was a problem hiding this comment.
We should guard the declarations in the header file too.
kylehickinson
force-pushed
the
ios-ipfs-build-fix
branch
from
782be7f
to
4abf8ec
Compare
kylehickinson
force-pushed
the
ios-ipfs-build-fix
branch
from
4abf8ec
to
2d5f62e
Compare
|
supersede by #16873 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Small build regression fix from #16073
Resolves
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_testswikinpm run lint,npm run presubmitwiki,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan: