code adjustments due to merge

Author: csgui

clarity/src/vm/clarity_wasm.rs

@@ -2130,7 +2130,12 @@ fn wasm_to_clarity_value(
                     wasm_to_clarity_value(ty, index, buffer, memory, store, epoch)?;
                 data_map.push((
                     name.clone(),
-                    value.ok_or(Error::Unchecked(CheckErrors::BadTupleConstruction))?,
+                    value.ok_or_else(|| {
+                        Error::Unchecked(CheckErrors::BadTupleConstruction(format!(
+                            "Failed to convert Wasm value into Clarity value for field `{}`",
+                            name.to_owned()
+                        )))
+                    })?,
                 ));
                 index += increment;
             }

clarity/src/vm/tests/assets.rs

@@ -16,18 +16,18 @@
 #[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::analysis::analysis_db;
 use crate::vm::contexts::{AssetMap, OwnedEnvironment};
-use crate::vm::database::MemoryBackingStore;
 use crate::vm::errors::Error;
 use crate::vm::events::StacksTransactionEvent;
 use crate::vm::representations::SymbolicExpression;
 use crate::vm::tests::{test_clarity_versions, test_epochs};
 use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, Value};
 #[cfg(test)]
+#[allow(unused_imports)]
 use crate::vm::{
     ast::ASTRules,
     contexts::AssetMapEntry,
+    database::MemoryBackingStore,
     errors::{CheckErrors, RuntimeErrorType},
     tests::{
         execute, is_committed, is_err_code, symbols_from_values, tl_env_factory as env_factory,

clarity/src/vm/tests/contracts.rs

@@ -20,12 +20,13 @@ use rstest::rstest;
 use stacks_common::types::{chainstate::BlockHeaderHash, StacksEpochId};
 
 use crate::vm::contexts::Environment;
-use crate::vm::database::MemoryBackingStore;
 use crate::vm::tests::{test_clarity_versions, test_epochs};
 use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, StandardPrincipalData, Value};
 #[cfg(test)]
+#[allow(unused_imports)]
 use crate::vm::{
     ast::{errors::ParseErrors, ASTRules},
+    database::MemoryBackingStore,
     errors::{CheckErrors, Error, RuntimeErrorType},
     tests::{
         env_factory, execute, is_committed, is_err_code_i128 as is_err_code, symbols_from_values,

clarity/src/vm/tests/traits.rs

@@ -18,11 +18,11 @@ use stacks_common::types::StacksEpochId;
 
 #[cfg(test)]
 use super::MemoryEnvironmentGenerator;
-use crate::vm::database::MemoryBackingStore;
 use crate::vm::tests::{test_clarity_versions, test_epochs};
 #[cfg(test)]
 use crate::vm::{
     ast::ASTRules,
+    database::MemoryBackingStore,
     errors::{CheckErrors, Error},
     tests::{env_factory, execute, symbols_from_values},
     types::{PrincipalData, QualifiedContractIdentifier, Value},

stackslib/src/chainstate/burn/db/sortdb.rs

@@ -22,17 +22,7 @@ use std::{cmp, fs};
 
 use clarity::util::lru_cache::LruCache;
 use clarity::vm::ast::ASTRules;
-use clarity::vm::costs::ExecutionCost;
-use clarity::vm::representations::{ClarityName, ContractName};
-use clarity::vm::types::{PrincipalData, Value};
-use rand;
-use rand::RngCore;
-use rusqlite::types::ToSql;
-use rusqlite::{
-    params, Connection, Error as sqlite_error, OpenFlags, OptionalExtension, Row, Transaction,
-};
-use sha2::{Digest, Sha512_256};
-use stacks_common::address::AddressHashMode;
+use rusqlite::{params, Connection, OptionalExtension, Row, Transaction};
 use stacks_common::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, PoxId, SortitionId, StacksAddress, StacksBlockId,
     TrieHash, VRFSeed,

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

@@ -8,7 +8,6 @@ use clarity::vm::database::*;
 use clarity::vm::errors::{CheckErrors, Error};
 use clarity::vm::test_util::{execute, symbols_from_values, TEST_BURN_STATE_DB, TEST_HEADER_DB};
 use clarity::vm::tooling::mem_type_check;
-use clarity::vm::types::Value::Response;
 use clarity::vm::types::{
     OptionalData, PrincipalData, QualifiedContractIdentifier, ResponseData, StandardPrincipalData,
     TupleData, Value,

stackslib/src/chainstate/stacks/db/transactions.rs

@@ -17,19 +17,16 @@
 use std::collections::{HashMap, HashSet};
 
 use clar2wasm::compile_contract;
-use clarity::vm::analysis::run_analysis;
 use clarity::vm::analysis::types::ContractAnalysis;
 use clarity::vm::ast::errors::ParseErrors;
 use clarity::vm::ast::ASTRules;
 use clarity::vm::clarity::TransactionConnection;
 use clarity::vm::contexts::{AssetMap, AssetMapEntry, Environment};
 use clarity::vm::costs::cost_functions::ClarityCostFunction;
-use clarity::vm::costs::{cost_functions, runtime_cost, CostTracker, ExecutionCost};
-use clarity::vm::database::{ClarityBackingStore, ClarityDatabase};
+use clarity::vm::costs::{runtime_cost, CostTracker, ExecutionCost};
 use clarity::vm::diagnostic::DiagnosableError;
 use clarity::vm::errors::{Error as InterpreterError, WasmError};
-use clarity::vm::representations::{ClarityName, ContractName};
-use clarity::vm::types::serialization::SerializationError as ClaritySerializationError;
+use clarity::vm::representations::ClarityName;
 use clarity::vm::types::{
     AssetIdentifier, BuffData, PrincipalData, QualifiedContractIdentifier, SequenceData,
     StacksAddressExtensions as ClarityStacksAddressExt, StandardPrincipalData, TupleData,