Skip to content

Commit 60bc908

Browse files
federico-stacksfederico-stacks
committed
merge: conflicts with develop, #6627 
2 parents 39dc20a + c7c7fd6 commit 60bc908

File tree

33 files changed

+116
-2596
lines changed

33 files changed

+116
-2596
lines changed

‎stackslib/src/chainstate/tests/consensus.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use crate::net::tests::NakamotoBootPlan;
5454
/// The epochs to test for consensus are the current and upcoming epochs.
5555
/// This constant must be changed when new epochs are introduced.
5656
/// Note that contract deploys MUST be done in each epoch >= 2.0.
57-
pub const EPOCHS_TO_TEST: &[StacksEpochId] = &[StacksEpochId::Epoch32, StacksEpochId::Epoch33];
57+
pub const EPOCHS_TO_TEST: &[StacksEpochId] = &[StacksEpochId::Epoch33];
5858

5959
pub const SK_1: &str = "a1289f6438855da7decf9b61b852c882c398cff1446b2a0f823538aa2ebef92e01";
6060
pub const SK_2: &str = "4ce9a8f7539ea93753a36405b16e8b57e15a552430410709c2b6d65dca5c02e201";
@@ -1196,7 +1196,7 @@ fn test_successfully_deploy_and_call() {
11961196
/// Example of using the `contract_deploy_consensus_test!` macro
11971197
/// Deploys a contract to all epoch, for each Clarity version
11981198
#[test]
1199-
fn test_succesfully_deploy() {
1199+
fn test_successfully_deploy() {
12001200
contract_deploy_consensus_test!(
12011201
contract_name: "foo_contract",
12021202
contract_code: FOO_CONTRACT,

‎stackslib/src/chainstate/tests/snapshots/blockstack_lib__chainstate__tests__consensus__append_empty_blocks.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ expression: result
44
---
55
[
66
Failure("Invalid Nakamoto block: failed static transaction checks"),
7-
Failure("Invalid Nakamoto block: failed static transaction checks"),
87
]

‎stackslib/src/chainstate/tests/snapshots/blockstack_lib__chainstate__tests__consensus__append_stx_transfers_success.snap‎

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,7 @@ expression: result
44
---
55
[
66
Success(ExpectedBlockOutput(
7-
marf_hash: "095b12065b5aa5f0cc29dc004b16507be9fb7964a1d656e891a232931db1810a",
8-
evaluated_epoch: Epoch32,
9-
transactions: [
10-
ExpectedTransactionOutput(
11-
tx: "TokenTransfer(from: ST000000000000000000002AMW42H, amount: 1000, memo: 00000000000000000000000000000000000000000000000000000000000000000000)",
12-
vm_error: "None [NON-CONSENSUS BREAKING]",
13-
return_type: Response(ResponseData(
14-
committed: true,
15-
data: Bool(true),
16-
)),
17-
cost: ExecutionCost(
18-
write_length: 0,
19-
write_count: 0,
20-
read_length: 0,
21-
read_count: 0,
22-
runtime: 0,
23-
),
24-
),
25-
ExpectedTransactionOutput(
26-
tx: "TokenTransfer(from: ST000000000000000000002AMW42H, amount: 1000, memo: 00000000000000000000000000000000000000000000000000000000000000000000)",
27-
vm_error: "None [NON-CONSENSUS BREAKING]",
28-
return_type: Response(ResponseData(
29-
committed: true,
30-
data: Bool(true),
31-
)),
32-
cost: ExecutionCost(
33-
write_length: 0,
34-
write_count: 0,
35-
read_length: 0,
36-
read_count: 0,
37-
runtime: 0,
38-
),
39-
),
40-
ExpectedTransactionOutput(
41-
tx: "TokenTransfer(from: ST000000000000000000002AMW42H, amount: 1000, memo: 00000000000000000000000000000000000000000000000000000000000000000000)",
42-
vm_error: "None [NON-CONSENSUS BREAKING]",
43-
return_type: Response(ResponseData(
44-
committed: true,
45-
data: Bool(true),
46-
)),
47-
cost: ExecutionCost(
48-
write_length: 0,
49-
write_count: 0,
50-
read_length: 0,
51-
read_count: 0,
52-
runtime: 0,
53-
),
54-
),
55-
],
56-
total_block_cost: ExecutionCost(
57-
write_length: 0,
58-
write_count: 0,
59-
read_length: 0,
60-
read_count: 0,
61-
runtime: 0,
62-
),
63-
)),
64-
Success(ExpectedBlockOutput(
65-
marf_hash: "180457415b54799e13905b076af575c96c77614e13e26f8211aa32e7cb1e893e",
7+
marf_hash: "c56a8191ab95c754a08477d6fbe025a07902dc168afaa75f23f87585a885fe0d",
668
evaluated_epoch: Epoch33,
679
transactions: [
6810
ExpectedTransactionOutput(

‎stackslib/src/chainstate/tests/snapshots/blockstack_lib__chainstate__tests__consensus__succesfully_deploy.snap‎ renamed to ‎stackslib/src/chainstate/tests/snapshots/blockstack_lib__chainstate__tests__consensus__successfully_deploy.snap‎

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -4,91 +4,7 @@ expression: result
44
---
55
[
66
Success(ExpectedBlockOutput(
7-
marf_hash: "2ce4de490b154fb8a34def19fdb09e491866d97b1b65f93001546a7a3a511330",
8-
evaluated_epoch: Epoch32,
9-
transactions: [
10-
ExpectedTransactionOutput(
11-
tx: "SmartContract(name: foo_contract-Epoch3_2-Clarity1, code_body: [..], clarity_version: Some(Clarity1))",
12-
vm_error: "None [NON-CONSENSUS BREAKING]",
13-
return_type: Response(ResponseData(
14-
committed: true,
15-
data: Bool(true),
16-
)),
17-
cost: ExecutionCost(
18-
write_length: 121,
19-
write_count: 2,
20-
read_length: 1,
21-
read_count: 1,
22-
runtime: 11968,
23-
),
24-
),
25-
],
26-
total_block_cost: ExecutionCost(
27-
write_length: 121,
28-
write_count: 2,
29-
read_length: 1,
30-
read_count: 1,
31-
runtime: 11968,
32-
),
33-
)),
34-
Success(ExpectedBlockOutput(
35-
marf_hash: "c8dfd00987410234fccec49f62ab2d4a04bdf9b5365f6767166308ad4f487cd4",
36-
evaluated_epoch: Epoch32,
37-
transactions: [
38-
ExpectedTransactionOutput(
39-
tx: "SmartContract(name: foo_contract-Epoch3_2-Clarity2, code_body: [..], clarity_version: Some(Clarity2))",
40-
vm_error: "None [NON-CONSENSUS BREAKING]",
41-
return_type: Response(ResponseData(
42-
committed: true,
43-
data: Bool(true),
44-
)),
45-
cost: ExecutionCost(
46-
write_length: 121,
47-
write_count: 2,
48-
read_length: 1,
49-
read_count: 1,
50-
runtime: 11968,
51-
),
52-
),
53-
],
54-
total_block_cost: ExecutionCost(
55-
write_length: 121,
56-
write_count: 2,
57-
read_length: 1,
58-
read_count: 1,
59-
runtime: 11968,
60-
),
61-
)),
62-
Success(ExpectedBlockOutput(
63-
marf_hash: "e7c2fe0aaf0fce43e576f9cdf939f722b3facc078fb592c47355f0f8a5037bc0",
64-
evaluated_epoch: Epoch32,
65-
transactions: [
66-
ExpectedTransactionOutput(
67-
tx: "SmartContract(name: foo_contract-Epoch3_2-Clarity3, code_body: [..], clarity_version: Some(Clarity3))",
68-
vm_error: "None [NON-CONSENSUS BREAKING]",
69-
return_type: Response(ResponseData(
70-
committed: true,
71-
data: Bool(true),
72-
)),
73-
cost: ExecutionCost(
74-
write_length: 121,
75-
write_count: 2,
76-
read_length: 1,
77-
read_count: 1,
78-
runtime: 11968,
79-
),
80-
),
81-
],
82-
total_block_cost: ExecutionCost(
83-
write_length: 121,
84-
write_count: 2,
85-
read_length: 1,
86-
read_count: 1,
87-
runtime: 11968,
88-
),
89-
)),
90-
Success(ExpectedBlockOutput(
91-
marf_hash: "5e60cb259552a6ac6c0151adbf81b7494ec14c79632d5ad017885b1ec1549e94",
7+
marf_hash: "94115ef92238e1d23e1086b1f35ad06ae71ad9a6a9d55e0740fc2ca74d385988",
928
evaluated_epoch: Epoch33,
939
transactions: [
9410
ExpectedTransactionOutput(
@@ -116,7 +32,7 @@ expression: result
11632
),
11733
)),
11834
Success(ExpectedBlockOutput(
119-
marf_hash: "f719cd580fc99c6561b0eeefed7a578db73fe0ef6a8bd01a178721c433d5731d",
35+
marf_hash: "a08639545f89d688bc71276874454cdde38b76a9969b28e26a52234fc9eace16",
12036
evaluated_epoch: Epoch33,
12137
transactions: [
12238
ExpectedTransactionOutput(
@@ -144,7 +60,7 @@ expression: result
14460
),
14561
)),
14662
Success(ExpectedBlockOutput(
147-
marf_hash: "6948ac94d7a54ffde32f97de08d6a1ef95f21673b99d749bf80c380c35a8264a",
63+
marf_hash: "a8f34b1a8ff77fdae2dd4737362a09972ee491851bdb1bf740b7b2b8a65435f4",
14864
evaluated_epoch: Epoch33,
14965
transactions: [
15066
ExpectedTransactionOutput(
@@ -172,7 +88,7 @@ expression: result
17288
),
17389
)),
17490
Success(ExpectedBlockOutput(
175-
marf_hash: "46493ecf6d5f7340968e1ac7a375299031250e2c46317edeed879decc9d4985b",
91+
marf_hash: "8969ea6e19138f90ef742d0437b0cd83dde9df679efafc85bee65f8d1e3840e3",
17692
evaluated_epoch: Epoch33,
17793
transactions: [
17894
ExpectedTransactionOutput(

0 commit comments

Comments
 (0)