aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-12-19 08:08:49 -0500
committerMarcoFalke <falke.marco@gmail.com>2017-12-19 08:08:51 -0500
commit797441ee995aac59f55d59a93ecb55e8ecbe7dbc (patch)
tree9f871b25fbf4ee587853972f31bbda51596a8376
parent2971fd030f6e20ff5279bd86ba18acc5e5ed1ce9 (diff)
parent45085192501db329e1eff330d9c1244f101449a3 (diff)
downloadbitcoin-797441ee995aac59f55d59a93ecb55e8ecbe7dbc.tar.xz
Merge #11947: test: Fix rawtransactions test
4508519250 test: Fix rawtransactions test (Wladimir J. van der Laan) Pull request description: Looks like another `assert_raises_jsonrpc` snuck in with #11178. Change it to `assert_raises_rpc_error`. Tree-SHA512: c2c2fb78be5dcc490981896cf60be1fba0b41c385a4f18de084b2e0a042c5b06bf6da617d3bf3b7e585b728554f5c8e1814b85045ba542cca9dfb7b826fda75a
-rwxr-xr-xtest/functional/rawtransactions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/rawtransactions.py b/test/functional/rawtransactions.py
index d6213a4ba5..aa519eb8e8 100755
--- a/test/functional/rawtransactions.py
+++ b/test/functional/rawtransactions.py
@@ -258,7 +258,7 @@ class RawTransactionsTest(BitcoinTestFramework):
encrawtx = "010000000001010000000000000072c1a6a246ae63f74f931e8365e15a089c68d61900000000000000000000ffffffff0100e1f50500000000000000000000"
decrawtx = self.nodes[0].decoderawtransaction(encrawtx, True) # decode as witness transaction
assert_equal(decrawtx['vout'][0]['value'], Decimal('1.00000000'))
- assert_raises_jsonrpc(-22, 'TX decode failed', self.nodes[0].decoderawtransaction, encrawtx, False) # force decode as non-witness transaction
+ assert_raises_rpc_error(-22, 'TX decode failed', self.nodes[0].decoderawtransaction, encrawtx, False) # force decode as non-witness transaction
# non-witness transaction
encrawtx = "01000000010000000000000072c1a6a246ae63f74f931e8365e15a089c68d61900000000000000000000ffffffff0100e1f505000000000000000000"
decrawtx = self.nodes[0].decoderawtransaction(encrawtx, False) # decode as non-witness transaction