diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2018-11-27 17:43:48 +0000 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-18 09:34:04 -0400 |
| commit | 966d8d08425cce597c8429754a668d2f556870d2 (patch) | |
| tree | bee0cdeafa4456339c166527c9ba4073637f959b | |
| parent | bb36ac82efb576d12b7ddac2c3f9277be9a74c2e (diff) | |
| download | bitcoin-966d8d08425cce597c8429754a668d2f556870d2.tar.xz | |
Bugfix: test/functional/rpc_psbt: Remove check for specific error message that depends on uncertain assumptions
When converttopsbt is called with a signed transaction, it either fails with "TX decode failed" if one or more inputs were segwit, or "Inputs must not have scriptSigs and scriptWitnesses" otherwise.
Since no effort is made by the test to ensure the inputs are segwit or not, avoid checking the exact message used.
The error code is still checked to ensure it is of the correct kind of failure.
Github-Pull: #14818
Rebased-From: 097c4aa379f255639ce0084702693fa72a595d6b
| -rwxr-xr-x | test/functional/rpc_psbt.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index 53f606f2ec..4b0480bf12 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -145,9 +145,10 @@ class PSBTTest(BitcoinTestFramework): self.nodes[0].decodepsbt(new_psbt) # Make sure that a psbt with signatures cannot be converted + # Error could be either "TX decode failed" (segwit inputs causes parsing to fail) or "Inputs must not have scriptSigs and scriptWitnesses" 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) + assert_raises_rpc_error(-22, "", self.nodes[0].converttopsbt, signedtx['hex']) + assert_raises_rpc_error(-22, "", self.nodes[0].converttopsbt, signedtx['hex'], False) # Unless we allow it to convert and strip signatures self.nodes[0].converttopsbt(signedtx['hex'], True) |