phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

descriptors refactor: Use range-for and limit scope of seen_multipath

Browse source 
* Range-for avoids ++i/i++ debate and decreases linecount.
* seen_multipath is only used if multipath_segment_index hasn't already been set. Rename it to seen_substitutes to better describe what it does, now that the context implies its involved in multipath.
This commit is contained in:
Hodlinator 2025-03-29 20:43:48 +01:00
parent 99a92efdd9
commit 7e974f474e
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/script/descriptor.cpp
View file

@ -1442,7 +1442,6 @@ std::optional<uint32_t> ParseKeyPathNum(std::span<const char> elem, bool& apostr
KeyPath path; KeyPath path;
std::optional<size_t> multipath_segment_index; std::optional<size_t> multipath_segment_index;
std::vector<uint32_t> multipath_values; std::vector<uint32_t> multipath_values;
std::unordered_set<uint32_t> seen_multipath;
for (size_t i = 1; i < split.size(); ++i) { for (size_t i = 1; i < split.size(); ++i) {
const std::span<const char>& elem = split[i]; const std::span<const char>& elem = split[i];
@ -1465,10 +1464,11 @@ std::optional<uint32_t> ParseKeyPathNum(std::span<const char> elem, bool& apostr
return false; return false;
} }
std::unordered_set<uint32_t> seen_substitutes;
for (const auto& num : nums) { for (const auto& num : nums) {
const auto& op_num = ParseKeyPathNum(num, apostrophe, error); const auto& op_num = ParseKeyPathNum(num, apostrophe, error);
if (!op_num) return false; if (!op_num) return false;
auto [_, inserted] = seen_multipath.insert(*op_num); auto [_, inserted] = seen_substitutes.insert(*op_num);
if (!inserted) { if (!inserted) {
error = strprintf("Duplicated key path value %u in multipath specifier", *op_num); error = strprintf("Duplicated key path value %u in multipath specifier", *op_num);
return false; return false;
@ -1489,9 +1489,9 @@ std::optional<uint32_t> ParseKeyPathNum(std::span<const char> elem, bool& apostr
out.emplace_back(std::move(path)); out.emplace_back(std::move(path));
} else { } else {
// Replace the multipath placeholder with each value while generating paths // Replace the multipath placeholder with each value while generating paths
for (size_t i = 0; i < multipath_values.size(); i++) { for (uint32_t substitute : multipath_values) {
KeyPath branch_path = path; KeyPath branch_path = path;
branch_path[*multipath_segment_index] = multipath_values[i]; branch_path[*multipath_segment_index] = substitute;
out.emplace_back(std::move(branch_path)); out.emplace_back(std::move(branch_path));
} }
} }