Skip to content

Commit f17dedd

Browse files
authored
bump chia_rs dependency (#20023)
1 parent f2d9281 commit f17dedd

16 files changed

+80
-74
lines changed

chia/_tests/blockchain/blockchain_test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async def _validate_and_add_block(
7676
conds = None
7777
else:
7878
# fake the signature validation. Just say True here.
79-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
79+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0, 0, 0, 0)
8080
results = PreValidationResult(None, uint64(1), conds, uint32(0))
8181
else:
8282
future = await pre_validate_block(

chia/_tests/blockchain/test_blockchain.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4352,6 +4352,9 @@ async def test_include_spends_same_as_parent(
43524352
True,
43534353
0,
43544354
0,
4355+
0,
4356+
0,
4357+
0,
43554358
)
43564359
# Now let's run the test
43574360
test_setup.fork_info.include_spends(conds, test_setup.test_block, test_setup.test_block.header_hash)

chia/_tests/core/custom_types/test_proof_of_space.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,17 @@ def test_verify_and_get_quality_string_v2(caplog: pytest.LogCaptureFixture, case
206206
(0, 2),
207207
(DEFAULT_CONSTANTS.HARD_FORK_HEIGHT, 2),
208208
(DEFAULT_CONSTANTS.HARD_FORK2_HEIGHT, 2),
209-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT - 1, 2),
210-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT, 4),
211-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT - 1, 4),
212-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT, 5),
213-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT - 1, 5),
214-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT, 6),
215-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT - 1, 6),
216-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT, 7),
217-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT - 1, 7),
218-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT, 8),
219-
(DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT + 1000000, 8),
209+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_4_HEIGHT - 1, 2),
210+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_4_HEIGHT, 4),
211+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_5_HEIGHT - 1, 4),
212+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_5_HEIGHT, 5),
213+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_6_HEIGHT - 1, 5),
214+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_6_HEIGHT, 6),
215+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_7_HEIGHT - 1, 6),
216+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_7_HEIGHT, 7),
217+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT - 1, 7),
218+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT, 8),
219+
(DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT + 1000000, 8),
220220
],
221221
)
222222
def test_calculate_plot_strength(height: uint32, strength: uint8) -> None:

chia/_tests/core/full_node/test_full_node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@
112112

113113

114114
def test_pre_validation_result() -> None:
115-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
115+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0, 0, 0, 0)
116116
results = PreValidationResult(None, uint64(1), conds, uint32(0))
117117
assert results.validated_signature is True
118118

119-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0)
119+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0, 0, 0, 0)
120120
results = PreValidationResult(None, uint64(1), conds, uint32(0))
121121
assert results.validated_signature is False
122122

chia/_tests/core/full_node/test_generator_tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

8282
def test_tx_removals_and_additions() -> None:
8383
conditions = SpendBundleConditions(
84-
spends, uint64(0), uint32(0), uint64(0), None, None, [], uint64(0), 0, 0, False, 0, 0
84+
spends, uint64(0), uint32(0), uint64(0), None, None, [], uint64(0), 0, 0, False, 0, 0, 0, 0, 0
8585
)
8686
expected_rems = [coin_ids[0], coin_ids[1]]
8787
expected_additions = []

chia/_tests/core/mempool/test_mempool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def make_item(
119119
return MempoolItem(
120120
SpendBundle([], G2Element()),
121121
fee,
122-
SpendBundleConditions([], 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0),
122+
SpendBundleConditions([], 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0, 0, 0, 0),
123123
spend_bundle_name,
124124
uint32(0),
125125
assert_height,

chia/_tests/core/mempool/test_mempool_manager.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,9 @@ def make_test_conds(
375375
False,
376376
0,
377377
0,
378+
0,
379+
0,
380+
0,
378381
)
379382

380383

chia/_tests/fee_estimation/test_fee_estimation_integration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def make_mempoolitem() -> MempoolItem:
4040

4141
fee = uint64(10000000)
4242
spends: list[SpendConditions] = []
43-
conds = SpendBundleConditions(spends, 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0)
43+
conds = SpendBundleConditions(spends, 0, 0, 0, None, None, [], cost, 0, 0, False, 0, 0, 0, 0, 0)
4444
mempool_item = MempoolItem(
4545
spend_bundle,
4646
fee,

chia/_tests/util/test_condition_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def mk_agg_sig_conditions(
5353
condition_cost=0,
5454
fingerprint=b"",
5555
)
56-
return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0)
56+
return SpendBundleConditions([spend], 0, 0, 0, None, None, agg_sig_unsafe_data, 0, 0, 0, False, 0, 0, 0, 0, 0)
5757

5858

5959
@pytest.mark.parametrize(
@@ -100,7 +100,7 @@ def test_pkm_pairs_vs_for_conditions_dict(opcode: ConditionOpcode) -> None:
100100

101101
class TestPkmPairs:
102102
def test_empty_list(self) -> None:
103-
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0)
103+
conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, False, 0, 0, 0, 0, 0)
104104
pks, msgs = pkm_pairs(conds, b"foobar")
105105
assert pks == []
106106
assert msgs == []

chia/_tests/util/test_replace_str_to_bytes.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
PLOT_FILTER_128_HEIGHT=uint32(10542000),
6666
PLOT_FILTER_64_HEIGHT=uint32(15592000),
6767
PLOT_FILTER_32_HEIGHT=uint32(20643000),
68-
PLOT_DIFFICULTY_INITIAL=uint8(2),
69-
PLOT_DIFFICULTY_4_HEIGHT=uint32(0xFFFFFFFF),
70-
PLOT_DIFFICULTY_5_HEIGHT=uint32(0xFFFFFFFF),
71-
PLOT_DIFFICULTY_6_HEIGHT=uint32(0xFFFFFFFF),
72-
PLOT_DIFFICULTY_7_HEIGHT=uint32(0xFFFFFFFF),
73-
PLOT_DIFFICULTY_8_HEIGHT=uint32(0xFFFFFFFF),
68+
PLOT_STRENGTH_INITIAL=uint8(2),
69+
PLOT_STRENGTH_4_HEIGHT=uint32(0xFFFFFFFF),
70+
PLOT_STRENGTH_5_HEIGHT=uint32(0xFFFFFFFF),
71+
PLOT_STRENGTH_6_HEIGHT=uint32(0xFFFFFFFF),
72+
PLOT_STRENGTH_7_HEIGHT=uint32(0xFFFFFFFF),
73+
PLOT_STRENGTH_8_HEIGHT=uint32(0xFFFFFFFF),
7474
)
7575

7676

0 commit comments

Comments
 (0)