aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-02-19 16:30:36 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-02-19 16:31:20 +0100
commit38429c4b622887f2c1db15a7826215477ca6868c (patch)
treeab273db5a3afd702e145892f0191475c0286207f /test/functional/test_framework
parent3e4fd407538160daf4267a784d308e8368177edc (diff)
parent8e4b4f683a0b342cec24cd51b1e98433034ea2ea (diff)
downloadbitcoin-38429c4b622887f2c1db15a7826215477ca6868c.tar.xz
Merge #15404: [test] Remove -txindex to start nodes
8e4b4f683a0b342cec24cd51b1e98433034ea2ea Address test todos by removing -txindex to nodes. Originally added when updating getrawtransaction to stop searching unspent utxos. (Amiti Uttarwar) Pull request description: Original todos added when removing getrawtransaction default behavior of searching unspent utxos. Tree-SHA512: d080953c3b0d2e5dca2265a15966dc25985a614c9cc86271ecd6276178ce428c85e262c24df92501695c32fed7beec0339b989f03cce91b57fb2efba201b7809
Diffstat (limited to 'test/functional/test_framework')
-rw-r--r--test/functional/test_framework/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index d0a78d8dfd..fef9982412 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -410,12 +410,12 @@ def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
# Transaction/Block functions
#############################
-def find_output(node, txid, amount):
+def find_output(node, txid, amount, *, blockhash=None):
"""
Return index to output of txid with value amount
Raises exception if there is none.
"""
- txdata = node.getrawtransaction(txid, 1)
+ txdata = node.getrawtransaction(txid, 1, blockhash)
for i in range(len(txdata["vout"])):
if txdata["vout"][i]["value"] == amount:
return i