diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-15 08:34:45 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-15 08:54:45 +0800 |
| commit | d052f5e6b79b9600f929457e9280b441b772785b (patch) | |
| tree | eddb177d784c3f70e692ab7219afaa89e918cfc2 /src/test/fuzz/script.cpp | |
| parent | a0e75bd31dffa2742406d18e020a2e897fcb21f0 (diff) | |
| parent | 7966aa424a8b78983f73742cbdb3d11eccaf9f3a (diff) | |
Merge #16841: Replace GetScriptForWitness with GetScriptForDestination
7966aa424a8b78983f73742cbdb3d11eccaf9f3a Add variables for repeated scripts (MeshCollider)
fec8336ad97dc717ea123f84ecfc10d9ee4a11db Remove GetScriptForWitness function (MeshCollider)
b887060d06290abf4983a487f8da6b0986b058ab Replace usage of GetScriptForWitness with GetScriptForDestination (MeshCollider)
Pull request description:
As per this TODO in the code:
> TODO: replace calls to GetScriptForWitness with GetScriptForDestination using the various witness-specific CTxDestination subtypes.
The commit "Add additional check for P2SH before adding extra wrapper" also adds an additional check that the scriptPubKey is a P2SH before auto-wrapping the witness script. We shouldn't wrap the witness script if not. Note: #16251 is even better than this check, please review that.
ACKs for top commit:
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/16841/commits/7966aa424a8b78983f73742cbdb3d11eccaf9f3a
jonatack:
Code review re-ACK 7966aa4 per `git range-diff b4d0366 ed266f7 7966aa4`
achow101:
re-ACK 7966aa424a8b78983f73742cbdb3d11eccaf9f3a only changes since last is rebase.
Tree-SHA512: 3449e0e83bd842acc7c94544a85367da97ac20d859eefc1a618caef0c98204398c266fe8fb9600b78326df5175402e1ae4a132eb766e2c4485e7cda6a2a95c43
Diffstat (limited to 'src/test/fuzz/script.cpp')
| -rw-r--r-- | src/test/fuzz/script.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/fuzz/script.cpp b/src/test/fuzz/script.cpp index 85aac6ac7a..4274fa4351 100644 --- a/src/test/fuzz/script.cpp +++ b/src/test/fuzz/script.cpp @@ -63,8 +63,6 @@ void test_one_input(const std::vector<uint8_t>& buffer) int required_ret; (void)ExtractDestinations(script, type_ret, addresses, required_ret); - (void)GetScriptForWitness(script); - const FlatSigningProvider signing_provider; (void)InferDescriptor(script, signing_provider); |