mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-25 21:39:05 +01:00
scripted-diff: Remove redundant sync_all and sync_blocks
The sync calls are redundant after a call to generate, because generate already syncs itself. -BEGIN VERIFY SCRIPT- perl -0777 -pi -e 's/(generate[^\n]*\)[^\n]*)(\n|\s)+self.sync_(all|blocks)\([^\)]*\)\n/\1\n/g' $(git grep -l generate ./test) -END VERIFY SCRIPT-
This commit is contained in:
@@ -218,7 +218,6 @@ class EstimateFeeTest(BitcoinTestFramework):
|
||||
self.fees_per_kb.append(float(fee) / tx_kbytes)
|
||||
self.sync_mempools(wait=.1)
|
||||
mined = mining_node.getblock(self.generate(mining_node, 1)[0], True)["tx"]
|
||||
self.sync_blocks(wait=.1)
|
||||
# update which txouts are confirmed
|
||||
newmem = []
|
||||
for utx in self.memutxo:
|
||||
@@ -278,8 +277,6 @@ class EstimateFeeTest(BitcoinTestFramework):
|
||||
# Finish by mining a normal-sized block:
|
||||
while len(self.nodes[1].getrawmempool()) > 0:
|
||||
self.generate(self.nodes[1], 1)
|
||||
|
||||
self.sync_blocks(self.nodes[0:3], wait=.1)
|
||||
self.log.info("Final estimates after emptying mempools")
|
||||
check_estimates(self.nodes[1], self.fees_per_kb)
|
||||
|
||||
@@ -322,7 +319,6 @@ class EstimateFeeTest(BitcoinTestFramework):
|
||||
for txid in txids_to_replace:
|
||||
miner.prioritisetransaction(txid=txid, fee_delta=-COIN)
|
||||
self.generate(miner, 1)
|
||||
self.sync_blocks(wait=.1, nodes=[node, miner])
|
||||
# RBF the low-fee transactions
|
||||
while True:
|
||||
try:
|
||||
@@ -334,7 +330,6 @@ class EstimateFeeTest(BitcoinTestFramework):
|
||||
# Mine the last replacement txs
|
||||
self.sync_mempools(wait=.1, nodes=[node, miner])
|
||||
self.generate(miner, 1)
|
||||
self.sync_blocks(wait=.1, nodes=[node, miner])
|
||||
|
||||
# Only 10% of the transactions were really confirmed with a low feerate,
|
||||
# the rest needed to be RBF'd. We must return the 90% conf rate feerate.
|
||||
|
||||
Reference in New Issue
Block a user