Merge #16609: descriptor: fix missed m_script_arg arg renaming in #14934

MarcoFalke · MarcoFalke · commit 034575e9c7a3 · 2019-08-14T08:01:30.000-04:00
3963856 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
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
@@ -492,9 +492,9 @@ class DescriptorImpl : public Descriptor
             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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -492,9 +492,9 @@ class DescriptorImpl : public Descriptor`
`492`	`492`	`if (!p->GetPrivKey(pos, provider, key)) continue;`
`493`	`493`	`out.keys.emplace(key.GetPubKey().GetID(), key);`
`494`	`494`	`}`
`495`		`- if (m_script_arg) {`
	`495`	`+ if (m_subdescriptor_arg) {`
`496`	`496`	`FlatSigningProvider subprovider;`
`497`		`- m_script_arg->ExpandPrivate(pos, provider, subprovider);`
	`497`	`+ m_subdescriptor_arg->ExpandPrivate(pos, provider, subprovider);`
`498`	`498`	`out = Merge(out, subprovider);`
`499`	`499`	`}`
`500`	`500`	`}`