highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-10-11 03:53:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Add "include mempool" flag to MiniWallet rescan_utxos

Browse Source
This commit is contained in:
Miles Liu
2022-12-15 22:50:51 +08:00
parent d0a909ae54
commit fc0caaf4aa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/test_framework/wallet.py
View File

@@ -119,7 +119,7 @@ class MiniWallet:
def get_balance(self): def get_balance(self):
return sum(u['value'] for u in self._utxos) return sum(u['value'] for u in self._utxos)
def rescan_utxos(self): def rescan_utxos(self, *, include_mempool=True):
"""Drop all utxos and rescan the utxo set""" """Drop all utxos and rescan the utxo set"""
self._utxos = [] self._utxos = []
res = self._test_node.scantxoutset(action="start", scanobjects=[self.get_descriptor()]) res = self._test_node.scantxoutset(action="start", scanobjects=[self.get_descriptor()])
@@ -132,6 +132,12 @@ class MiniWallet:
height=utxo["height"], height=utxo["height"],
coinbase=utxo["coinbase"], coinbase=utxo["coinbase"],
confirmations=res["height"] - utxo["height"] + 1)) confirmations=res["height"] - utxo["height"] + 1))
if include_mempool:
mempool = self._test_node.getrawmempool(verbose=True)
# Sort tx by ancestor count. See BlockAssembler::SortForBlock in src/node/miner.cpp
sorted_mempool = sorted(mempool.items(), key=lambda item: (item[1]["ancestorcount"], int(item[0], 16)))
for txid, _ in sorted_mempool:
self.scan_tx(self._test_node.getrawtransaction(txid=txid, verbose=True))
def scan_tx(self, tx): def scan_tx(self, tx):
"""Scan the tx and adjust the internal list of owned utxos""" """Scan the tx and adjust the internal list of owned utxos"""