aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/mempool_resurrect_test.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-01-04 13:54:23 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-03-14 16:45:04 +0100
commitfa8cd46f39778925eaf2caf812cccd9fb8503368 (patch)
tree68084803ac7bc2da9317b68b0aba11556315d5a1 /qa/rpc-tests/mempool_resurrect_test.py
parentfad7dc8a6c0ca9c067a249cf8896dd2e64703e48 (diff)
downloadbitcoin-fa8cd46f39778925eaf2caf812cccd9fb8503368.tar.xz
[qa] Move create_tx() to util.py
Diffstat (limited to 'qa/rpc-tests/mempool_resurrect_test.py')
-rwxr-xr-xqa/rpc-tests/mempool_resurrect_test.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/qa/rpc-tests/mempool_resurrect_test.py b/qa/rpc-tests/mempool_resurrect_test.py
index 9fcc88a2a3..0ba46e6f51 100755
--- a/qa/rpc-tests/mempool_resurrect_test.py
+++ b/qa/rpc-tests/mempool_resurrect_test.py
@@ -21,14 +21,6 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
self.nodes.append(start_node(0, self.options.tmpdir, args))
self.is_network_split = False
- def create_tx(self, from_txid, to_address, amount):
- inputs = [{ "txid" : from_txid, "vout" : 0}]
- outputs = { to_address : amount }
- rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
- signresult = self.nodes[0].signrawtransaction(rawtx)
- assert_equal(signresult["complete"], True)
- return signresult["hex"]
-
def run_test(self):
node0_address = self.nodes[0].getnewaddress()
# Spend block 1/2/3's coinbase transactions
@@ -43,13 +35,13 @@ class MempoolCoinbaseTest(BitcoinTestFramework):
b = [ self.nodes[0].getblockhash(n) for n in range(1, 4) ]
coinbase_txids = [ self.nodes[0].getblock(h)['tx'][0] for h in b ]
- spends1_raw = [ self.create_tx(txid, node0_address, 49.99) for txid in coinbase_txids ]
+ spends1_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.99) for txid in coinbase_txids ]
spends1_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends1_raw ]
blocks = []
blocks.extend(self.nodes[0].generate(1))
- spends2_raw = [ self.create_tx(txid, node0_address, 49.98) for txid in spends1_id ]
+ spends2_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.98) for txid in spends1_id ]
spends2_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends2_raw ]
blocks.extend(self.nodes[0].generate(1))