aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-08-14 08:01:26 -0400
committerMarcoFalke <falke.marco@gmail.com>2019-08-14 08:01:30 -0400
commit034575e9c7a33d9fd0e4296d43ff21e8d5be9cf1 (patch)
tree826c47ebf87a48964d7f0573f0a85b675c119aa0
parente7df1ecd17584e4dc3fe2948f9927faed9c2e8e0 (diff)
parent396385657cf053ac6c947a5d0640c887f20ae5bb (diff)
Merge #16609: descriptor: fix missed m_script_arg arg renaming in #14934
396385657cf053ac6c947a5d0640c887f20ae5bb descriptor: fix missed m_script_arg arg renaming in #14934 (fanquake) Pull request description: Fixes a missed renaming from #14934. ACKs for top commit: Sjors: ACK 3963856 Tree-SHA512: da2972301b2b83556f1f3f3b72758bb69570422cdd57c65aa7657b4e3dcc597dde03e7f1cf8988e8c3b6737737b4c0bee4aefb329376e24e7dedc2cab73fcf88
-rw-r--r--src/script/descriptor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index 8ae0460273..327af62a4f 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -492,9 +492,9 @@ public:
if (!p->GetPrivKey(pos, provider, key)) continue;
out.keys.emplace(key.GetPubKey().GetID(), key);
}
- if (m_script_arg) {
+ if (m_subdescriptor_arg) {
FlatSigningProvider subprovider;
- m_script_arg->ExpandPrivate(pos, provider, subprovider);
+ m_subdescriptor_arg->ExpandPrivate(pos, provider, subprovider);
out = Merge(out, subprovider);
}
}