diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 09:05:59 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 09:22:08 +0100 |
commit | 30c2d8c635c41149b7184ea8471121c53042444c (patch) | |
tree | 90541c9459dc7e0be79684e190ca9e614f1a7c51 /qa/rpc-tests/txn_clone.py | |
parent | 1b5118bfa0d94dbc0f3d7803c3e68626b0a694ee (diff) | |
parent | 9ac63d6d3056600c1b784da0e6b98f679fa98b6e (diff) |
Merge pull request #7105
9ac63d6 Keep track of explicit wallet conflicts instead of using mempool (Pieter Wuille)
Diffstat (limited to 'qa/rpc-tests/txn_clone.py')
-rwxr-xr-x | qa/rpc-tests/txn_clone.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py index e8ced0e5bb..b1f603a192 100755 --- a/qa/rpc-tests/txn_clone.py +++ b/qa/rpc-tests/txn_clone.py @@ -136,7 +136,7 @@ class TxnMallTest(BitcoinTestFramework): tx2 = self.nodes[0].gettransaction(txid2) # Verify expected confirmations - assert_equal(tx1["confirmations"], -1) + assert_equal(tx1["confirmations"], -2) assert_equal(tx1_clone["confirmations"], 2) assert_equal(tx2["confirmations"], 1) |