diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h index 347dbc3c9e8..f9c5753ba5b 100644 --- a/src/node/blockstorage.h +++ b/src/node/blockstorage.h @@ -352,7 +352,6 @@ public: /** * All pairs A->B, where A (or one of its ancestors) misses transactions, but B has transactions. - * Pruned nodes may have entries where B is missing data. */ std::multimap m_blocks_unlinked; diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index 0487a138fcc..4a0b3346096 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -6,7 +6,6 @@ WARNING: This test uses 4GB of disk space. -This test takes 30 mins or more (up to 2 hours) """ import os @@ -351,17 +350,15 @@ class PruneTest(BitcoinTestFramework): self.log.info("Stop and start pruning node to trigger wallet rescan") self.restart_node(2, extra_args=["-prune=550"]) - wallet_info = self.nodes[2].getwalletinfo() - self.wait_until(lambda: wallet_info["scanning"] == False) - self.wait_until(lambda: wallet_info["lastprocessedblock"]["height"] == self.nodes[2].getblockcount()) + self.wait_until(lambda: self.nodes[2].getwalletinfo()["scanning"] == False) + self.wait_until(lambda: self.nodes[2].getwalletinfo()["lastprocessedblock"]["height"] == self.nodes[2].getblockcount()) # check that wallet loads successfully when restarting a pruned node after IBD. # this was reported to fail in #7494. self.restart_node(5, extra_args=["-prune=550", "-blockfilterindex=1"]) # restart to trigger rescan - wallet_info = self.nodes[5].getwalletinfo() - self.wait_until(lambda: wallet_info["scanning"] == False) - self.wait_until(lambda: wallet_info["lastprocessedblock"]["height"] == self.nodes[0].getblockcount()) + self.wait_until(lambda: self.nodes[5].getwalletinfo()["scanning"] == False) + self.wait_until(lambda: self.nodes[5].getwalletinfo()["lastprocessedblock"]["height"] == self.nodes[0].getblockcount()) def run_test(self): self.log.info("Warning! This test requires 4GB of disk space")