mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-03 01:09:14 +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:
@@ -406,7 +406,6 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||
ismine=True)
|
||||
txid = w0.sendtoaddress(address, 49.99995540)
|
||||
self.generatetoaddress(self.nodes[0], 6, w0.getnewaddress())
|
||||
self.sync_blocks()
|
||||
tx = wpriv.createrawtransaction([{"txid": txid, "vout": 0}], {w0.getnewaddress(): 49.999})
|
||||
signed_tx = wpriv.signrawtransactionwithwallet(tx)
|
||||
w1.sendrawtransaction(signed_tx['hex'])
|
||||
@@ -452,12 +451,10 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||
assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 1000)
|
||||
txid = w0.sendtoaddress(addr, 10)
|
||||
self.generate(self.nodes[0], 6)
|
||||
self.sync_all()
|
||||
send_txid = wmulti_priv.sendtoaddress(w0.getnewaddress(), 8)
|
||||
decoded = wmulti_priv.gettransaction(txid=send_txid, verbose=True)['decoded']
|
||||
assert_equal(len(decoded['vin'][0]['txinwitness']), 4)
|
||||
self.generate(self.nodes[0], 6)
|
||||
self.sync_all()
|
||||
|
||||
self.nodes[1].createwallet(wallet_name="wmulti_pub", disable_private_keys=True, blank=True, descriptors=True)
|
||||
wmulti_pub = self.nodes[1].get_wallet_rpc("wmulti_pub")
|
||||
@@ -495,7 +492,6 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||
vout2 = find_vout_for_address(self.nodes[0], txid2, addr2)
|
||||
|
||||
self.generate(self.nodes[0], 6)
|
||||
self.sync_all()
|
||||
assert_equal(wmulti_pub.getbalance(), wmulti_priv.getbalance())
|
||||
|
||||
# Make sure that descriptor wallets containing multiple xpubs in a single descriptor load correctly
|
||||
@@ -583,7 +579,6 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||
addr = wmulti_priv_big.getnewaddress()
|
||||
w0.sendtoaddress(addr, 10)
|
||||
self.generate(self.nodes[0], 1)
|
||||
self.sync_all()
|
||||
# It is standard and would relay.
|
||||
txid = wmulti_priv_big.sendtoaddress(w0.getnewaddress(), 9.999)
|
||||
decoded = wmulti_priv_big.gettransaction(txid=txid, verbose=True)['decoded']
|
||||
@@ -618,7 +613,6 @@ class ImportDescriptorsTest(BitcoinTestFramework):
|
||||
addr = multi_priv_big.getnewaddress("", "legacy")
|
||||
w0.sendtoaddress(addr, 10)
|
||||
self.generate(self.nodes[0], 6)
|
||||
self.sync_all()
|
||||
# It is standard and would relay.
|
||||
txid = multi_priv_big.sendtoaddress(w0.getnewaddress(), 10, "", "", True)
|
||||
decoded = multi_priv_big.gettransaction(txid=txid, verbose=True)['decoded']
|
||||
|
||||
Reference in New Issue
Block a user