Skip to content

Commit

Permalink
fixup test_db_validate_default_1000_blocks() (#19222)
Browse files Browse the repository at this point in the history
* fixup `test_db_validate_default_1000_blocks()`

* a different take
  • Loading branch information
altendky authored Feb 4, 2025
1 parent a1663df commit 1d9ab3c
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions chia/_tests/core/test_db_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,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)
Expand All @@ -85,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)
Expand All @@ -95,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)
Expand All @@ -109,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)
Expand Down Expand Up @@ -157,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)

Expand All @@ -167,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 = default_config.copy()
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)

0 comments on commit 1d9ab3c

Please sign in to comment.