Skip to content

feat: add macros for contract consensus tests #6562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

feat: add macros for contract consensus tests #6562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4f8dfff
WIP: add consensus_test macro
Jiloc Oct 3, 2025
8bdc1d1
use TxTypes for TransactionFactory
Jiloc Oct 6, 2025
79ae07d
Merge branch 'feat/aac-tests-with-insta' into feat/improve-consensus-…
Jiloc Oct 6, 2025
d9eb380
remove unused snap
Jiloc Oct 6, 2025
6977d1a
Merge branch 'develop' into feat/improve-consensus-test-api
Jiloc Oct 7, 2025
4e37cef
fix contract_call_to_all_epochs
Jiloc Oct 7, 2025
e5e2a24
rewrite empty_blocks test with consensus_test
Jiloc Oct 7, 2025
5c6c36c
Merge branch 'develop' into feat/improve-consensus-test-api
Jiloc Oct 8, 2025
a5d8406
WIP: add consensus_test_contract_exec_helper
Jiloc Oct 9, 2025
423f5a1
Merge branch 'develop' into feat/improve-consensus-test-api
Jiloc Oct 9, 2025
bd4722f
Merge branch 'bug/fix-consensus-test-canonical-tip' into feat/improve…
Jiloc Oct 10, 2025
286703c
Merge branch 'develop' into feat/improve-consensus-test-api
Jiloc Oct 10, 2025
8a6ec15
remove experimental expect_same_result
Jiloc Oct 10, 2025
73a4fb1
remove redactions features from insta
Jiloc Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions clarity/src/vm/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ impl ClarityVersion {
ClarityVersion::Clarity4
}

pub const ALL: &'static [ClarityVersion] = &[
ClarityVersion::Clarity1,
ClarityVersion::Clarity2,
ClarityVersion::Clarity3,
ClarityVersion::Clarity4,
];

pub fn default_for_epoch(epoch_id: StacksEpochId) -> ClarityVersion {
match epoch_id {
StacksEpochId::Epoch10 => {
Expand Down
7 changes: 7 additions & 0 deletions stacks-common/src/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,13 @@ impl StacksEpochId {
StacksEpochId::Epoch32
}

pub const ALL_GTE_30: &'static [StacksEpochId] = &[
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the idea of adding this here is that, even if requires manual updating when we add a new epoch, most of the functions in this file will also need to be updated. Expecially the ones above this, fn latest(). I believe it will be difficult to miss it!

StacksEpochId::Epoch30,
StacksEpochId::Epoch31,
StacksEpochId::Epoch32,
StacksEpochId::Epoch33,
];

/// In this epoch, how should the mempool perform garbage collection?
pub fn mempool_garbage_behavior(&self) -> MempoolCollectionBehavior {
match self {
Expand Down
4 changes: 4 additions & 0 deletions stackslib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ chrono = "0.4.19"
tempfile = "3.3"
proptest = { version = "1.6.0", default-features = false, features = ["std"] }
insta = { version = "1.37.0", features = ["ron"] }
pinny = { git = "https://github.com/BitcoinL2-Labs/pinny-rs.git", rev = "54ba9d533a7b84525a5e65a3eae1a3ae76b9ea49" } #v0.0.2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added pinny to simplify discovery of consesus tests. The main reason was to easiliy identify the ones relying on insta to easily filter them. But after some discussions we realized that this is not currently needed. As all of our consensus tests are currently within the consensus file. I can remove it


[features]
default = []
Expand All @@ -95,3 +96,6 @@ sha2 = { version = "0.10", features = ["asm"] }

[target.'cfg(any(not(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")), any(target_os="windows")))'.dependencies]
sha2 = { version = "0.10" }

[package.metadata.pinny]
allowed = ["consensus"]
Loading
Loading