diff options
author | Pieter Wuille <pieter@wuille.net> | 2021-11-01 16:32:53 -0400 |
---|---|---|
committer | Pieter Wuille <pieter@wuille.net> | 2021-11-29 17:58:53 -0500 |
commit | 568dd2f83900a11a4dbba1250722791a135bf0a9 (patch) | |
tree | b9091ef5f60075570c9f0e0c487282450e152ec0 /src/script/descriptor.cpp | |
parent | 383d350bd5107bfe00e3b90a00cab9a3c1397c72 (diff) |
Replace MakeSpan helper with Span deduction guide
Diffstat (limited to 'src/script/descriptor.cpp')
-rw-r--r-- | src/script/descriptor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index c3b4d1ddaa..1c99df147b 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -631,7 +631,7 @@ public: out.origins.emplace(entry.first.GetID(), std::make_pair<CPubKey, KeyOriginInfo>(CPubKey(entry.first), std::move(entry.second))); } - output_scripts = MakeScripts(pubkeys, MakeSpan(subscripts), out); + output_scripts = MakeScripts(pubkeys, Span{subscripts}, out); return true; } @@ -974,10 +974,10 @@ std::unique_ptr<PubkeyProvider> ParsePubkeyInner(uint32_t key_exp_index, const S } KeyPath path; DeriveType type = DeriveType::NO; - if (split.back() == MakeSpan("*").first(1)) { + if (split.back() == Span{"*"}.first(1)) { split.pop_back(); type = DeriveType::UNHARDENED; - } else if (split.back() == MakeSpan("*'").first(2) || split.back() == MakeSpan("*h").first(2)) { + } else if (split.back() == Span{"*'"}.first(2) || split.back() == Span{"*h"}.first(2)) { split.pop_back(); type = DeriveType::HARDENED; } |