code changes due to merge conflicts

Author: csgui

clarity/src/vm/tests/assets.rs

@@ -17,10 +17,9 @@
 use stacks_common::types::StacksEpochId;
 
 use crate::vm::analysis::analysis_db;
-use crate::vm::ast::ASTRules;
-use crate::vm::contexts::{AssetMap, AssetMapEntry, OwnedEnvironment};
+use crate::vm::contexts::{AssetMap, OwnedEnvironment};
 use crate::vm::database::MemoryBackingStore;
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
+use crate::vm::errors::Error;
 use crate::vm::events::StacksTransactionEvent;
 use crate::vm::representations::SymbolicExpression;
 use crate::vm::tests::{test_clarity_versions, test_epochs};

stacks-node/Cargo.toml

@@ -42,7 +42,7 @@ tikv-jemallocator = {workspace = true}
 
 [dev-dependencies]
 warp = "0.3.5"
-tokio = "1.15"
+tokio = { version = "1.15", features = ["rt-multi-thread"] }
 reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls", "rustls-tls"] }
 clarity = { path = "../clarity", features = ["default", "testing"]}
 stacks-common = { path = "../stacks-common", features = ["default", "testing"] }
@@ -76,6 +76,7 @@ prod-genesis-chainstate = []
 default = []
 testing = ["stacks-common/testing", "stacks/testing", "clarity/testing"]
 build-signer-v3-1-0-0-13 = ["signer_v3_1_0_0_13", "libsigner_v3_1_0_0_13", "stacks_v3_1_00_13", "stacks_common_v3_1_00_13"]
+wasm = ["stacks-common/wasm"]
 
 [package.metadata.pinny]
 allowed = ["bitcoind", "flaky", "slow"]

stackslib/src/chainstate/stacks/boot/contract_tests.rs

@@ -1784,7 +1784,7 @@ fn test_deploy_smart_contract(
             &analysis,
             content,
             None,
-            |_, _| false,
+            |_, _| None,
             None,
         )?;
         tx.save_analysis(contract_id, &analysis)?;

stackslib/src/clarity_vm/tests/contracts.rs

@@ -230,7 +230,7 @@ fn test_get_block_info_eval_v210() {
                 .analyze_smart_contract(&contract_identifier, clarity_version, contract, ASTRules::PrecheckSize)
                 .unwrap();
             clarity_db
-                .initialize_smart_contract(&contract_identifier, clarity_version, &mut ast, &analysis, contract, None, |_, _| false, None)
+                .initialize_smart_contract(&contract_identifier, clarity_version, &mut ast, &analysis, contract, None, |_, _| None, None)
                 .unwrap();
         });
         let mut tx = conn.start_transaction_processing();

stackslib/src/clarity_vm/tests/costs.rs

@@ -23,6 +23,7 @@ use clarity::vm::costs::{
     compute_cost, ClarityCostFunctionEvaluator, ClarityCostFunctionReference, CostErrors,
     DefaultVersion, ExecutionCost, LimitedCostTracker, COSTS_1_NAME, COSTS_2_NAME, COSTS_3_NAME,
 };
+use clarity::vm::database::MemoryBackingStore;
 use clarity::vm::errors::Error;
 use clarity::vm::events::StacksTransactionEvent;
 use clarity::vm::functions::NativeFunctions;

stackslib/src/clarity_vm/tests/large_contract.rs

@@ -166,7 +166,7 @@ fn test_simple_token_system(#[case] version: ClarityVersion, #[case] epoch: Stac
             | StacksEpochId::Epoch30
             | StacksEpochId::Epoch31
             | StacksEpochId::Epoch32 => {
-                let (ast, _analysis) = tx
+                let (mut ast, analysis) = tx
                     .analyze_smart_contract(
                         &boot_code_id("costs-3", false),
                         ClarityVersion::Clarity2,