aboutsummaryrefslogtreecommitdiff
path: root/test/functional/wallet_abandonconflict.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-11-10 18:02:31 +0100
committerMarcoFalke <falke.marco@gmail.com>2021-10-29 13:34:52 +0200
commitfacc352648e4fe1ed9b406400b6e4a9d51f30349 (patch)
tree7bba05900db761f91c0b416985a3a774984bfd49 /test/functional/wallet_abandonconflict.py
parent5574881ce329f91cc5bbc2b9585860a45fde7c3c (diff)
downloadbitcoin-facc352648e4fe1ed9b406400b6e4a9d51f30349.tar.xz
test: Implicitly sync after generate*, unless opted out
Diffstat (limited to 'test/functional/wallet_abandonconflict.py')
-rwxr-xr-xtest/functional/wallet_abandonconflict.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/functional/wallet_abandonconflict.py b/test/functional/wallet_abandonconflict.py
index 8f54e50598..edb3779f82 100755
--- a/test/functional/wallet_abandonconflict.py
+++ b/test/functional/wallet_abandonconflict.py
@@ -43,7 +43,6 @@ class AbandonConflictTest(BitcoinTestFramework):
# Can not abandon confirmed transaction
assert_raises_rpc_error(-5, 'Transaction not eligible for abandonment', lambda: self.nodes[0].abandontransaction(txid=txA))
- self.sync_blocks()
newbalance = self.nodes[0].getbalance()
assert balance - newbalance < Decimal("0.001") #no more than fees lost
balance = newbalance
@@ -167,7 +166,7 @@ class AbandonConflictTest(BitcoinTestFramework):
tx = self.nodes[0].createrawtransaction(inputs, outputs)
signed = self.nodes[0].signrawtransactionwithwallet(tx)
self.nodes[1].sendrawtransaction(signed["hex"])
- self.generate(self.nodes[1], 1)
+ self.generate(self.nodes[1], 1, sync_fun=self.no_op)
self.connect_nodes(0, 1)
self.sync_blocks()