Merge branch 'feat/clarity-wasm-develop' into test/clarity-wasm-type-value-err

Author: csgui

clarity/src/vm/tests/contracts.rs

@@ -460,6 +460,9 @@ fn test_fully_qualified_contract_call(
     }
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[apply(test_epochs)]
 fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator) {
     let mut owned_env = env_factory.get_env(epoch);
@@ -744,6 +747,9 @@ fn test_simple_contract_call(epoch: StacksEpochId, mut env_factory: MemoryEnviro
     }
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[apply(test_epochs)]
 fn test_aborts(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator) {
     let mut owned_env = env_factory.get_env(epoch);

clarity/src/vm/tests/traits.rs

@@ -702,6 +702,9 @@ fn test_reentrant_dynamic_dispatch(
     }
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[apply(test_clarity_versions)]
 fn test_readwrite_dynamic_dispatch(
     version: ClarityVersion,
@@ -759,6 +762,9 @@ fn test_readwrite_dynamic_dispatch(
     }
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[apply(test_clarity_versions)]
 fn test_readwrite_violation_dynamic_dispatch(
     version: ClarityVersion,

stackslib/Cargo.toml

@@ -99,13 +99,14 @@ rlimit = "0.10.2"
 chrono = "0.4.19"
 
 [features]
-default = []
+default = ["clarity-wasm"]
 profile-sqlite = []
 disable-costs = []
 developer-mode = ["clarity/developer-mode"]
 monitoring_prom = ["prometheus"]
 slog_json = ["stacks-common/slog_json", "clarity/slog_json", "pox-locking/slog_json"]
 testing = ["chrono"]
+clarity-wasm = []
 
 [target.'cfg(all(any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64"), not(any(target_os="windows"))))'.dependencies]
 sha2 = { version = "0.10", features = ["asm"] }

stackslib/src/clarity_vm/tests/costs.rs

@@ -820,12 +820,18 @@ fn epoch205_nfts(use_mainnet: bool) {
     );
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
 #[test]
+#[cfg(not(feature = "clarity-wasm"))]
 fn epoch205_nfts_mainnet() {
     epoch205_nfts(true)
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
 #[test]
+#[cfg(not(feature = "clarity-wasm"))]
 fn epoch205_nfts_testnet() {
     epoch205_nfts(false)
 }

stackslib/src/clarity_vm/tests/events.rs

@@ -271,6 +271,9 @@ fn test_emit_stx_burn_nok() {
     assert!(events.is_empty());
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[test]
 fn test_emit_nested_print_nok() {
     let contract = "(define-public (emit-event-nok)
@@ -288,6 +291,23 @@ fn test_emit_nested_print_nok() {
     assert_eq!(events.len(), 1);
 }
 
+#[test]
+fn test_emit_nested_print_nok_valid_contract() {
+    let contract = "(define-public (emit-event-nok)
+            (begin
+                (print \"bar\")
+                (err u1)))
+        (define-public (emit-event-ok)
+            (begin
+                (unwrap-err! (emit-event-nok) (err u1))
+                (print \"foo\")
+                (ok u1)))";
+
+    let (value, events) = helper_execute(contract, "emit-event-ok");
+    assert_eq!(value, Value::okay(Value::UInt(1)).unwrap());
+    assert_eq!(events.len(), 1);
+}
+
 #[test]
 fn test_emit_ft_transfer_ok() {
     let contract = "(define-constant sender 'SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR)

stackslib/src/clarity_vm/tests/forking.rs

@@ -210,6 +210,9 @@ fn test_at_block_good(#[case] version: ClarityVersion, #[case] epoch: StacksEpoc
     );
 }
 
+// Test not valid for clarity-wasm runtime
+// Contracts would error in the static analysis pass.
+#[cfg(not(feature = "clarity-wasm"))]
 #[apply(test_clarity_versions)]
 fn test_at_block_missing_defines(#[case] version: ClarityVersion, #[case] epoch: StacksEpochId) {
     fn initialize_1(owned_env: &mut OwnedEnvironment) {