highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-12 13:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripted-diff: rename DescriptorImpl m_script_arg to m_subdescriptor_arg

Browse Source 
-BEGIN VERIFY SCRIPT-
sed -i -e 's/m_script_arg/m_subdescriptor_arg/g' src/script/descriptor.cpp
-END VERIFY SCRIPT-
This commit is contained in:
Sjors Provoost
2018-12-12 09:45:55 +01:00
parent 7275365c9b
commit 2290269759
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/script/descriptor.cpp
View File

@@ -210,7 +210,7 @@ class DescriptorImpl : public Descriptor
//! Public key arguments for this descriptor (size 1 for PK, PKH, WPKH; any size of Multisig). //! Public key arguments for this descriptor (size 1 for PK, PKH, WPKH; any size of Multisig).
const std::vector<std::unique_ptr<PubkeyProvider>> m_pubkey_args; const std::vector<std::unique_ptr<PubkeyProvider>> m_pubkey_args;
//! The sub-descriptor argument (nullptr for everything but SH and WSH). //! The sub-descriptor argument (nullptr for everything but SH and WSH).
const std::unique_ptr<DescriptorImpl> m_script_arg; const std::unique_ptr<DescriptorImpl> m_subdescriptor_arg;
//! The string name of the descriptor function. //! The string name of the descriptor function.
const std::string m_name; const std::string m_name;
@@ -221,10 +221,10 @@ protected:
/** A helper function to construct the scripts for this descriptor. /** A helper function to construct the scripts for this descriptor.
* *
* This function is invoked once for every CScript produced by evaluating * This function is invoked once for every CScript produced by evaluating
* m_script_arg, or just once in case m_script_arg is nullptr. * m_subdescriptor_arg, or just once in case m_subdescriptor_arg is nullptr.
* @param pubkeys The evaluations of the m_pubkey_args field. * @param pubkeys The evaluations of the m_pubkey_args field.
* @param script The evaluation of m_script_arg (or nullptr when m_script_arg is nullptr). * @param script The evaluation of m_subdescriptor_arg (or nullptr when m_subdescriptor_arg is nullptr).
* @param out A FlatSigningProvider to put scripts or public keys in that are necessary to the solver. * @param out A FlatSigningProvider to put scripts or public keys in that are necessary to the solver.
* The script and pubkeys argument to this function are automatically added. * The script and pubkeys argument to this function are automatically added.
* @return A vector with scriptPubKeys for this descriptor. * @return A vector with scriptPubKeys for this descriptor.
@@ -232,12 +232,12 @@ protected:
virtual std::vector<CScript> MakeScripts(const std::vector<CPubKey>& pubkeys, const CScript* script, FlatSigningProvider& out) const = 0; virtual std::vector<CScript> MakeScripts(const std::vector<CPubKey>& pubkeys, const CScript* script, FlatSigningProvider& out) const = 0;
public: public:
DescriptorImpl(std::vector<std::unique_ptr<PubkeyProvider>> pubkeys, std::unique_ptr<DescriptorImpl> script, const std::string& name) : m_pubkey_args(std::move(pubkeys)), m_script_arg(std::move(script)), m_name(name) {} DescriptorImpl(std::vector<std::unique_ptr<PubkeyProvider>> pubkeys, std::unique_ptr<DescriptorImpl> script, const std::string& name) : m_pubkey_args(std::move(pubkeys)), m_subdescriptor_arg(std::move(script)), m_name(name) {}
bool IsSolvable() const override bool IsSolvable() const override
{ {
if (m_script_arg) { if (m_subdescriptor_arg) {
if (!m_script_arg->IsSolvable()) return false; if (!m_subdescriptor_arg->IsSolvable()) return false;
} }
return true; return true;
} }
@@ -247,8 +247,8 @@ public:
for (const auto& pubkey : m_pubkey_args) { for (const auto& pubkey : m_pubkey_args) {
if (pubkey->IsRange()) return true; if (pubkey->IsRange()) return true;
} }
if (m_script_arg) { if (m_subdescriptor_arg) {
if (m_script_arg->IsRange()) return true; if (m_subdescriptor_arg->IsRange()) return true;
} }
return false; return false;
} }
@@ -268,10 +268,10 @@ public:
} }
ret += std::move(tmp); ret += std::move(tmp);
} }
if (m_script_arg) { if (m_subdescriptor_arg) {
if (pos++) ret += ","; if (pos++) ret += ",";
std::string tmp; std::string tmp;
if (!m_script_arg->ToStringHelper(arg, tmp, priv)) return false; if (!m_subdescriptor_arg->ToStringHelper(arg, tmp, priv)) return false;
ret += std::move(tmp); ret += std::move(tmp);
} }
out = std::move(ret) + ")"; out = std::move(ret) + ")";
@@ -311,9 +311,9 @@ public:
} }
} }
std::vector<CScript> subscripts; std::vector<CScript> subscripts;
if (m_script_arg) { if (m_subdescriptor_arg) {
FlatSigningProvider subprovider; FlatSigningProvider subprovider;
if (!m_script_arg->ExpandHelper(pos, arg, cache_read, subscripts, subprovider, cache_write)) return false; if (!m_subdescriptor_arg->ExpandHelper(pos, arg, cache_read, subscripts, subprovider, cache_write)) return false;
out = Merge(out, subprovider); out = Merge(out, subprovider);
} }
@@ -324,7 +324,7 @@ public:
out.origins.emplace(entry.first.GetID(), std::move(entry.second)); out.origins.emplace(entry.first.GetID(), std::move(entry.second));
out.pubkeys.emplace(entry.first.GetID(), entry.first); out.pubkeys.emplace(entry.first.GetID(), entry.first);
} }
if (m_script_arg) { if (m_subdescriptor_arg) {
for (const auto& subscript : subscripts) { for (const auto& subscript : subscripts) {
out.scripts.emplace(CScriptID(subscript), subscript); out.scripts.emplace(CScriptID(subscript), subscript);
std::vector<CScript> addscripts = MakeScripts(pubkeys, &subscript, out); std::vector<CScript> addscripts = MakeScripts(pubkeys, &subscript, out);