diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-12 19:09:23 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-12 19:14:13 +0100 |
| commit | 47ed24cf8aa7be3b778731b1f140ad9941157933 (patch) | |
| tree | 24e862b77de3767fb9e8e6f2e66b236cd320da70 /test/functional/rpc_psbt.py | |
| parent | 90c0b6aca2da0e15bd0575d583a167723f9cebed (diff) | |
| parent | 88a79cb436b30b39d37d139da723f5a31e9d161b (diff) | |
Merge #14356: fix converttopsbt permitsigdata arg, add basic test
88a79cb436b30b39d37d139da723f5a31e9d161b fix converttopsbt permitsigdata arg, add basic test (Gregory Sanders)
Pull request description:
The final check for extraneous sigdata has a flipped boolean, resulting in incorrect behavior.
Resolves https://github.com/bitcoin/bitcoin/issues/14355
Tree-SHA512: 5157a74b8ddebd7d836fba96765c4d7ed15a73d4289817353d3566a0f6803bd4bbc3f936735c517c7a83a6cbdb4052b9c61d23f6cc4ad00a6077278cd51adbd4
Diffstat (limited to 'test/functional/rpc_psbt.py')
| -rwxr-xr-x | test/functional/rpc_psbt.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index ba3818bf24..04d9bb65a6 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -146,6 +146,9 @@ class PSBTTest(BitcoinTestFramework): # Make sure that a psbt with signatures cannot be converted signedtx = self.nodes[0].signrawtransactionwithwallet(rawtx['hex']) assert_raises_rpc_error(-22, "TX decode failed", self.nodes[0].converttopsbt, signedtx['hex']) + assert_raises_rpc_error(-22, "TX decode failed", self.nodes[0].converttopsbt, signedtx['hex'], False) + # Unless we allow it to convert and strip signatures + self.nodes[0].converttopsbt(signedtx['hex'], True) # Explicitly allow converting non-empty txs new_psbt = self.nodes[0].converttopsbt(rawtx['hex']) |