From 9ef74264963f262de4747a0a50402c75073adc2f Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 3 Feb 2025 17:12:40 -0500 Subject: [PATCH 1/2] fixup `test_db_validate_default_1000_blocks()` --- chia/_tests/core/test_db_validation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chia/_tests/core/test_db_validation.py b/chia/_tests/core/test_db_validation.py index 01123eb7948f..92b21978cd57 100644 --- a/chia/_tests/core/test_db_validation.py +++ b/chia/_tests/core/test_db_validation.py @@ -3,6 +3,7 @@ import random import sqlite3 from contextlib import closing +from copy import deepcopy from pathlib import Path from typing import Any @@ -167,7 +168,7 @@ async def test_db_validate_default_1000_blocks(default_1000_blocks: list[FullBlo validate_v2(db_file, config=default_config, validate_blocks=True) assert "Blockchain has invalid genesis challenge" in str(execinfo.value) - new_config = default_config.copy() + new_config = deepcopy(default_config) new_config["full_node"]["network_overrides"]["constants"]["local"]["AGG_SIG_ME_ADDITIONAL_DATA"] = ( default_1000_blocks[0].foliage.prev_block_hash.hex() ) From 68dbf6903927e466061eff2178a31c0110f64187 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 3 Feb 2025 19:36:36 -0500 Subject: [PATCH 2/2] a different take --- chia/_tests/core/test_db_validation.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/chia/_tests/core/test_db_validation.py b/chia/_tests/core/test_db_validation.py index 92b21978cd57..d56f093e71e3 100644 --- a/chia/_tests/core/test_db_validation.py +++ b/chia/_tests/core/test_db_validation.py @@ -3,7 +3,6 @@ import random import sqlite3 from contextlib import closing -from copy import deepcopy from pathlib import Path from typing import Any @@ -71,12 +70,12 @@ def add_block( ) -default_config: dict[str, Any] = { - "full_node": {"selected_network": "local", "network_overrides": {"constants": {"local": {}}}} -} +@pytest.fixture(name="default_config") +def default_config_fixture() -> dict[str, Any]: + return {"full_node": {"selected_network": "local", "network_overrides": {"constants": {"local": {}}}}} -def test_db_validate_wrong_version() -> None: +def test_db_validate_wrong_version(default_config: dict[str, Any]) -> None: with TempFile() as db_file: with closing(sqlite3.connect(db_file)) as conn: make_version(conn, 3) @@ -86,7 +85,7 @@ def test_db_validate_wrong_version() -> None: assert "Database has the wrong version (3 expected 2)" in str(execinfo.value) -def test_db_validate_missing_peak_table() -> None: +def test_db_validate_missing_peak_table(default_config: dict[str, Any]) -> None: with TempFile() as db_file: with closing(sqlite3.connect(db_file)) as conn: make_version(conn, 2) @@ -96,7 +95,7 @@ def test_db_validate_missing_peak_table() -> None: assert "Database is missing current_peak table" in str(execinfo.value) -def test_db_validate_missing_peak_block() -> None: +def test_db_validate_missing_peak_block(default_config: dict[str, Any]) -> None: with TempFile() as db_file: with closing(sqlite3.connect(db_file)) as conn: make_version(conn, 2) @@ -110,7 +109,7 @@ def test_db_validate_missing_peak_block() -> None: @pytest.mark.parametrize("invalid_in_chain", [True, False]) -def test_db_validate_in_main_chain(invalid_in_chain: bool) -> None: +def test_db_validate_in_main_chain(invalid_in_chain: bool, default_config: dict[str, Any]) -> None: with TempFile() as db_file: with closing(sqlite3.connect(db_file)) as conn: make_version(conn, 2) @@ -158,7 +157,9 @@ async def make_db(db_file: Path, blocks: list[FullBlock]) -> None: @pytest.mark.anyio -async def test_db_validate_default_1000_blocks(default_1000_blocks: list[FullBlock]) -> None: +async def test_db_validate_default_1000_blocks( + default_1000_blocks: list[FullBlock], default_config: dict[str, Any] +) -> None: with TempFile() as db_file: await make_db(db_file, default_1000_blocks) @@ -168,8 +169,7 @@ async def test_db_validate_default_1000_blocks(default_1000_blocks: list[FullBlo validate_v2(db_file, config=default_config, validate_blocks=True) assert "Blockchain has invalid genesis challenge" in str(execinfo.value) - new_config = deepcopy(default_config) - new_config["full_node"]["network_overrides"]["constants"]["local"]["AGG_SIG_ME_ADDITIONAL_DATA"] = ( + default_config["full_node"]["network_overrides"]["constants"]["local"]["AGG_SIG_ME_ADDITIONAL_DATA"] = ( default_1000_blocks[0].foliage.prev_block_hash.hex() ) - validate_v2(db_file, config=new_config, validate_blocks=True) + validate_v2(db_file, config=default_config, validate_blocks=True)