Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #6368: fix(qt): set prune dependent options correctly
2d99b2c fix: force correct `-disablegovernance` and `-txindex` values when pruning is requested via init dialog (UdjinM6) 64b20f0 fix(qt): set prune dependent options correctly (Kittywhiskers Van Gogh) Pull request description: ## Issue being fixed or feature implemented A few things to note: 1. we shouldn't rely on `bPrune` cause it can be overridden via cmd-line 2. `addOverriddenOption` is used to highlight that there are GUI options that were overridden via cmd-line and neither `-disablegovernance` nor `-txindex` override anything, we simply set them to correct values here. 3. we should do all that in `SetPruneEnabled` case that's the central point for GUI prune option logic fixes #6366 #6367 alternative ## What was done? ## How Has This Been Tested? `./src/qt/dash-qt --regtest --resetguisettings` (could also add `--txindex=1` and/or `--disablegovernance=0`), check "Limit ..." box, click OK and confirm it continues with no errors (but with a warning about disabled governance, that's by design) close qt and check 2 more things: 1. `./src/qt/dash-qt --regtest` should have a warning about disabled governance 2. `./src/qt/dash-qt --regtest --prune=0` should have no warning about disabled governance (not true on `develop`) ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: ACK 2d99b2c PastaPastaPasta: utACK 2d99b2c Tree-SHA512: 465bd2f1ca86358145c4671af554078b00b2472375d65b8de7e01ae0db8b24c9b01844a2b8e5a4c85a6d65a892a169ee61797591c0dfc0f51ec044a8e2bba58a
- Loading branch information