Page MenuHomePhabricator

Merge #14561: Remove fs::relative call and fix listwalletdir tests
ClosedPublic

Authored by jasonbcox on Mar 23 2020, 18:41.

Details

Summary

ed2e18398b3ab657e98e3e1fe135cbf8dd94fda3 Remove fs::relative call and fix listwalletdir tests (João Barbosa)

Pull request description:

The implementation of `fs::relative` resolves symlinks which is not intended
in ListWalletDir. The replacement does what is required, and `listwalletdir` RPC
tests are fixed accordingly.

Also, `fs::recursive_directory_iterator` iteration is fixed to build with boost 1.47.

Based on #14559

Tree-SHA512: 1da516226073f195285d10d9d9648c90cce0158c5d1eb9c31217bb4abb575cd37f07c00787c5a850554d6120bbc5a3cbc5cb47d4488b32ac6bcb52bc1882d600

Backport of Core PR14561

Depends on D5546

Test Plan
ninja
test_runner.py wallet_multiwallet

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jasonbcox created this revision.Mar 23 2020, 18:41
Herald added a reviewer: Restricted Project. · View Herald TranscriptMar 23 2020, 18:41
teamcity edited the summary of this revision. (Show Details)Mar 23 2020, 18:41

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

jasonbcox edited the summary of this revision. (Show Details)Mar 23 2020, 18:42
Fabien requested changes to this revision.Mar 24 2020, 09:28
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/wallet/walletutil.cpp
80 ↗(On Diff #17123)

The comment is still valid and useful.

This revision now requires changes to proceed.Mar 24 2020, 09:28
jasonbcox updated this revision to Diff 17148.Mar 24 2020, 15:47

Fix mistaken merge conflict resolution

Fabien accepted this revision.Mar 24 2020, 16:06
This revision is now accepted and ready to land.Mar 24 2020, 16:06