kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-30 04:35:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: check more variable reuse scenarios

Browse Source
This commit is contained in:
Brice Dobry
2024-05-15 08:18:02 -04:00
parent 2b4b1c14bf
commit 890f07cd1d
2 changed files with 420 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clarity/src/vm/analysis/type_checker/v2_1/contexts.rs
View File

@@ -286,6 +286,10 @@ impl ContractContext {
trait_name: ClarityName,
trait_signature: BTreeMap<ClarityName, FunctionSignature>,
) -> CheckResult<()> {
if self.clarity_version >= ClarityVersion::Clarity3 {
self.check_name_used(&trait_name)?;
}
self.traits.add_defined_trait(
self.contract_identifier.clone(),
trait_name,
@@ -299,6 +303,10 @@ impl ContractContext {
trait_id: TraitIdentifier,
trait_signature: BTreeMap<ClarityName, FunctionSignature>,
) -> CheckResult<()> {
if self.clarity_version >= ClarityVersion::Clarity3 {
self.check_name_used(&alias)?;
}
self.traits.add_used_trait(alias, trait_id, trait_signature)
}

413
clarity/src/vm/tests/variables.rs
View File

@@ -439,7 +439,7 @@ fn reuse_block_height(
Value::Int(3),
);
// function
// private function
expect_contract_error(
version,
epoch,
@@ -463,6 +463,171 @@ fn reuse_block_height(
],
Value::Bool(true),
);
// constant
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"constant",
r#"
(define-constant block-height u1234)
(define-read-only (test-func) block-height)
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::UInt(1234),
);
// define-trait
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-trait block-height ())
(define-read-only (test-func) false)
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::Bool(false),
);
// tuple
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"tuple",
r#"
(define-read-only (test-func)
(get block-height { block-height: 1234 })
)
"#,
&[],
Value::Int(1234),
);
// define-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-fungible-token block-height)
(define-read-only (test-func) false)
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::Bool(false),
);
// define-non-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-non-fungible-token block-height uint)
(define-read-only (test-func) false)
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::Bool(false),
);
// define-public
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-public (block-height) (ok true))
(define-private (test-func) (unwrap-panic (block-height)))
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::Bool(true),
);
// define-read-only
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-read-only (block-height) true)
(define-private (test-func) (block-height))
"#,
&[
(
WhenError::Initialization,
|version, _| version < ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("block-height".to_string()),
),
(
WhenError::Analysis,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::ReservedWord("block-height".to_string()),
),
],
Value::Bool(true),
);
}
#[apply(test_clarity_versions)]
@@ -573,6 +738,129 @@ fn reuse_stacks_block_height(
)],
Value::Bool(true),
);
// constant
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"constant",
r#"
(define-constant stacks-block-height u1234)
(define-read-only (test-func) stacks-block-height)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::UInt(1234),
);
// define-trait
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-trait stacks-block-height ())
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::Bool(false),
);
// tuple
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"tuple",
r#"
(define-read-only (test-func)
(get stacks-block-height { stacks-block-height: 1234 })
)
"#,
&[],
Value::Int(1234),
);
// define-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-fungible-token stacks-block-height)
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::Bool(false),
);
// define-non-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-non-fungible-token stacks-block-height uint)
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::Bool(false),
);
// define-public
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-public (stacks-block-height) (ok true))
(define-private (test-func) (unwrap-panic (stacks-block-height)))
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::Bool(true),
);
// define-read-only
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-read-only (stacks-block-height) true)
(define-private (test-func) (stacks-block-height))
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("stacks-block-height".to_string()),
)],
Value::Bool(true),
);
}
#[apply(test_clarity_versions)]
@@ -683,4 +971,127 @@ fn reuse_tenure_height(
)],
Value::Bool(true),
);
// constant
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"constant",
r#"
(define-constant tenure-height u1234)
(define-read-only (test-func) tenure-height)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::UInt(1234),
);
// define-trait
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-trait tenure-height ())
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::Bool(false),
);
// tuple
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"tuple",
r#"
(define-read-only (test-func)
(get tenure-height { tenure-height: 1234 })
)
"#,
&[],
Value::Int(1234),
);
// define-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-fungible-token tenure-height)
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::Bool(false),
);
// define-non-fungible-token
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"trait",
r#"
(define-non-fungible-token tenure-height uint)
(define-read-only (test-func) false)
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::Bool(false),
);
// define-public
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-public (tenure-height) (ok true))
(define-private (test-func) (unwrap-panic (tenure-height)))
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::Bool(true),
);
// define-read-only
expect_contract_error(
version,
epoch,
&mut tl_env_factory,
"function",
r#"
(define-read-only (tenure-height) true)
(define-private (test-func) (tenure-height))
"#,
&[(
WhenError::Initialization,
|version, _| version >= ClarityVersion::Clarity3,
CheckErrors::NameAlreadyUsed("tenure-height".to_string()),
)],
Value::Bool(true),
);
}