mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-03 17:54:19 +02:00
Merge bitcoin/bitcoin#34635: rpc, index: txospenderindex improve formatting, docs and test coverage
15c4889497index: document TxoSpenderIndex::FindSpender (furszy)f8b9595aaatest: Add missing txospenderindex coverage in feature_init (Fabian Jahr)a1074d852aindex, rpc, test: Misc formatting fixes (Fabian Jahr) Pull request description: This addresses my own comments in the last review of #24539: https://github.com/bitcoin/bitcoin/pull/24539#pullrequestreview-3829110465 The first commit fixes three small formatting errors. The second commit adds some missing coverage in `feature_init` and refactors the code a bit as well so these misses don't happen so easily in the future. The third commit is by furzy: > TxoSpenderIndex::FindSpender returns an Expected<optional<TxoSpender>> but the two levels of the return type were undocumented, making it unclear what a returned nullopt means. So added doc clarifying each return case. ACKs for top commit: furszy: ACK15c4889497sedited: ACK15c4889497rkrux: crACK15c4889497Tree-SHA512: 2e0f060a54b558d2967ebae0835cf81bd86c2d8d983d670a48d1bee7d347f186623e75db7ae311ca1566807f715c1b3fa67cf734c9467d35e13b84d082f28253
This commit is contained in:
@@ -18,6 +18,12 @@ from test_framework.test_node import (
|
||||
)
|
||||
from test_framework.util import assert_equal
|
||||
|
||||
ALL_INDEX_ARGS = [
|
||||
'-txindex=1',
|
||||
'-blockfilterindex=1',
|
||||
'-coinstatsindex=1',
|
||||
'-txospenderindex=1',
|
||||
]
|
||||
|
||||
class InitTest(BitcoinTestFramework):
|
||||
"""
|
||||
@@ -74,6 +80,7 @@ class InitTest(BitcoinTestFramework):
|
||||
b'txindex thread start',
|
||||
b'block filter index thread start',
|
||||
b'coinstatsindex thread start',
|
||||
b'txospenderindex thread start',
|
||||
b'msghand thread start',
|
||||
b'net thread start',
|
||||
b'addcon thread start',
|
||||
@@ -81,22 +88,21 @@ class InitTest(BitcoinTestFramework):
|
||||
if self.is_wallet_compiled():
|
||||
lines_to_terminate_after.append(b'Verifying wallet')
|
||||
|
||||
args = ['-txindex=1', '-blockfilterindex=1', '-coinstatsindex=1', '-txospenderindex=1']
|
||||
for terminate_line in lines_to_terminate_after:
|
||||
self.log.info(f"Starting node and will terminate after line {terminate_line}")
|
||||
with node.busy_wait_for_debug_log([terminate_line]):
|
||||
if platform.system() == 'Windows':
|
||||
# CREATE_NEW_PROCESS_GROUP is required in order to be able
|
||||
# to terminate the child without terminating the test.
|
||||
node.start(extra_args=args, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
|
||||
node.start(extra_args=ALL_INDEX_ARGS, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
|
||||
else:
|
||||
node.start(extra_args=args)
|
||||
node.start(extra_args=ALL_INDEX_ARGS)
|
||||
self.log.debug("Terminating node after terminate line was found")
|
||||
sigterm_node()
|
||||
|
||||
# Prior to deleting/perturbing index files, start node with all indexes enabled.
|
||||
# 'check_clean_start' will ensure indexes are synchronized (i.e., data exists to modify)
|
||||
self.check_clean_start(node, args)
|
||||
self.check_clean_start(node, ALL_INDEX_ARGS)
|
||||
self.stop_node(0)
|
||||
|
||||
def init_stress_test_removals(self):
|
||||
@@ -105,7 +111,6 @@ class InitTest(BitcoinTestFramework):
|
||||
"""
|
||||
self.log.info("Test startup errors after removing certain essential files")
|
||||
node = self.nodes[0]
|
||||
args = ['-txindex=1', '-blockfilterindex=1', '-coinstatsindex=1']
|
||||
|
||||
def start_expecting_error(err_fragment, args):
|
||||
node.assert_start_raises_init_error(
|
||||
@@ -209,7 +214,7 @@ class InitTest(BitcoinTestFramework):
|
||||
self.log.debug(f"Restoring file from {bak_path} and restarting")
|
||||
Path(bak_path).rename(target_file)
|
||||
|
||||
self.check_clean_start(node, args)
|
||||
self.check_clean_start(node, ALL_INDEX_ARGS)
|
||||
self.stop_node(0)
|
||||
|
||||
self.log.info("Test startup errors after perturbing certain essential files")
|
||||
@@ -313,7 +318,7 @@ class InitTest(BitcoinTestFramework):
|
||||
self.log.info("Test that stopping and restarting a node that has done nothing is not causing a failure")
|
||||
options = [
|
||||
[],
|
||||
["-txindex=1", "-blockfilterindex=1", "-coinstatsindex=1"],
|
||||
ALL_INDEX_ARGS,
|
||||
]
|
||||
for option in options:
|
||||
self.restart_node(1, option)
|
||||
|
||||
@@ -111,7 +111,7 @@ class RpcMiscTest(BitcoinTestFramework):
|
||||
"txindex": values,
|
||||
"basic block filter index": values,
|
||||
"coinstatsindex": values,
|
||||
"txospenderindex": values
|
||||
"txospenderindex": values,
|
||||
}
|
||||
)
|
||||
# Specifying an index by name returns only the status of that index
|
||||
|
||||
Reference in New Issue
Block a user