aboutsummaryrefslogtreecommitdiff
path: root/test/functional/signrawtransactions.py
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2017-06-09 22:38:06 -0700
committerAndrew Chow <achow101-github@achow101.com>2017-07-18 10:59:06 -0700
commit6b4f231f5f0f88690488c4da20ea1c180dbc4b19 (patch)
treeed832262304d91d4c0c2941d53cf410a58d2da67 /test/functional/signrawtransactions.py
parent0b019357ff09e7a522307fc271d6b60562a7b890 (diff)
downloadbitcoin-6b4f231f5f0f88690488c4da20ea1c180dbc4b19.tar.xz
Move transaction combining from signrawtransaction to new RPC
Create a combinerawtransaction RPC which accepts a json array of hex raw transactions to combine them into one transaction. Signrawtransaction is changed to no longer combine transactions and only accept one transaction at a time.
Diffstat (limited to 'test/functional/signrawtransactions.py')
-rwxr-xr-xtest/functional/signrawtransactions.py16
1 files changed, 0 insertions, 16 deletions
diff --git a/test/functional/signrawtransactions.py b/test/functional/signrawtransactions.py
index 437905e764..415727268a 100755
--- a/test/functional/signrawtransactions.py
+++ b/test/functional/signrawtransactions.py
@@ -43,22 +43,6 @@ class SignRawTransactionsTest(BitcoinTestFramework):
# 2) No script verification error occurred
assert 'errors' not in rawTxSigned
- # Check that signrawtransaction doesn't blow up on garbage merge attempts
- dummyTxInconsistent = self.nodes[0].createrawtransaction([inputs[0]], outputs)
- rawTxUnsigned = self.nodes[0].signrawtransaction(rawTx + dummyTxInconsistent, inputs)
-
- assert 'complete' in rawTxUnsigned
- assert_equal(rawTxUnsigned['complete'], False)
-
- # Check that signrawtransaction properly merges unsigned and signed txn, even with garbage in the middle
- rawTxSigned2 = self.nodes[0].signrawtransaction(rawTxUnsigned["hex"] + dummyTxInconsistent + rawTxSigned["hex"], inputs)
-
- assert 'complete' in rawTxSigned2
- assert_equal(rawTxSigned2['complete'], True)
-
- assert 'errors' not in rawTxSigned2
-
-
def script_verification_error_test(self):
"""Create and sign a raw transaction with valid (vin 0), invalid (vin 1) and one missing (vin 2) input script.