Merge branch 'develop' into fix/profile-sqlite

Author: jcnelson

clarity/src/libclarity.rs

@@ -57,25 +57,11 @@ pub extern crate prometheus;
 
 #[macro_use]
 pub extern crate stacks_common;
-pub use stacks_common::{
-    impl_array_hexstring_fmt, impl_array_newtype, impl_byte_array_message_codec,
-    impl_byte_array_serde,
-};
-
-pub use stacks_common::codec;
-pub use stacks_common::consts;
-pub use stacks_common::types;
-pub use stacks_common::util;
 
 #[macro_use]
 /// The Clarity virtual machine
 pub mod vm;
 
-pub use stacks_common::address;
-
-/// A high level library for interacting with the Clarity vm
-// pub mod core;
-
 pub mod boot_util {
     use crate::vm::representations::ContractName;
     use crate::vm::types::QualifiedContractIdentifier;

clarity/src/vm/analysis/mod.rs

@@ -24,8 +24,8 @@ pub mod trait_checker;
 pub mod type_checker;
 pub mod types;
 
-use crate::types::StacksEpochId;
 use crate::vm::database::MemoryBackingStore;
+use stacks_common::types::StacksEpochId;
 
 pub use self::types::{AnalysisPass, ContractAnalysis};
 

clarity/src/vm/ast/mod.rs

@@ -41,11 +41,11 @@ use self::sugar_expander::SugarExpander;
 use self::traits_resolver::TraitsResolver;
 use self::types::BuildASTPass;
 pub use self::types::ContractAST;
-use crate::types::StacksEpochId;
 use crate::vm::costs::cost_functions::ClarityCostFunction;
 use crate::vm::diagnostic::{Diagnostic, Level};
 use crate::vm::representations::PreSymbolicExpression;
 use crate::vm::ClarityVersion;
+use stacks_common::types::StacksEpochId;
 
 /// Legacy function
 #[cfg(any(test, features = "testing"))]

clarity/src/vm/contexts.rs

@@ -45,7 +45,7 @@ use crate::vm::types::{
     QualifiedContractIdentifier, TraitIdentifier, TypeSignature, Value,
 };
 use crate::vm::{eval, is_reserved};
-use crate::{types::chainstate::StacksBlockId, types::StacksEpochId};
+use stacks_common::{types::chainstate::StacksBlockId, types::StacksEpochId};
 
 use crate::vm::costs::cost_functions::ClarityCostFunction;
 use crate::vm::version::ClarityVersion;

clarity/src/vm/database/clarity_db.rs

@@ -42,13 +42,15 @@ use crate::vm::types::{
 };
 use stacks_common::util::hash::{to_hex, Hash160, Sha256Sum, Sha512Trunc256Sum};
 
-use crate::types::chainstate::{
+use stacks_common::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, SortitionId, StacksAddress, StacksBlockId, VRFSeed,
 };
 
 use crate::vm::types::byte_len_of_serialization;
 
-use crate::types::{StacksEpoch as GenericStacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0};
+use stacks_common::types::{
+    StacksEpoch as GenericStacksEpoch, StacksEpochId, PEER_VERSION_EPOCH_2_0,
+};
 
 use stacks_common::consts::MINER_REWARD_MATURITY;
 use stacks_common::consts::{

clarity/src/vm/database/clarity_store.rs

@@ -32,10 +32,10 @@ use crate::vm::events::StacksTransactionEvent;
 use crate::vm::types::QualifiedContractIdentifier;
 use stacks_common::util::hash::{hex_bytes, to_hex, Hash160, Sha512Trunc256Sum};
 
-use crate::types::chainstate::{BlockHeaderHash, StacksBlockId, VRFSeed};
 use crate::vm::contexts::GlobalContext;
 use crate::vm::types::PrincipalData;
 use crate::vm::Value;
+use stacks_common::types::chainstate::{BlockHeaderHash, StacksBlockId, VRFSeed};
 
 pub struct NullBackingStore {}
 

clarity/src/vm/database/key_value_wrapper.rs

@@ -27,7 +27,7 @@ use crate::vm::{StacksEpoch, Value};
 use stacks_common::types::StacksEpochId;
 use stacks_common::util::hash::Sha512Trunc256Sum;
 
-use crate::types::chainstate::StacksBlockId;
+use stacks_common::types::chainstate::StacksBlockId;
 
 use super::clarity_store::SpecialCaseHandler;
 use super::{ClarityBackingStore, ClarityDeserializable};

clarity/src/vm/database/sqlite.rs

@@ -20,7 +20,7 @@ use rusqlite::{
     Savepoint, NO_PARAMS,
 };
 
-use crate::types::chainstate::StacksBlockId;
+use stacks_common::types::chainstate::StacksBlockId;
 
 use stacks_common::util::db_common::tx_busy_handler;
 

clarity/src/vm/docs/contracts.rs

@@ -5,14 +5,14 @@ use crate::vm::types::{FunctionType, Value};
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::iter::FromIterator;
 
-use crate::types::StacksEpochId;
 use crate::vm::ast::{build_ast_with_rules, ASTRules};
 use crate::vm::contexts::GlobalContext;
 use crate::vm::costs::LimitedCostTracker;
 use crate::vm::database::MemoryBackingStore;
 use crate::vm::types::QualifiedContractIdentifier;
 use crate::vm::version::ClarityVersion;
 use crate::vm::{self, ContractContext};
+use stacks_common::types::StacksEpochId;
 
 use stacks_common::consts::CHAIN_ID_TESTNET;
 

clarity/src/vm/docs/mod.rs

@@ -2649,16 +2649,16 @@ mod test {
 
     use super::make_json_api_reference;
     use super::{get_input_type_string, make_all_api_reference};
-    use crate::address::AddressHashMode;
-    use crate::types::chainstate::{SortitionId, StacksAddress, StacksBlockId};
-    use crate::types::Address;
     use crate::vm::analysis::type_check;
+    use crate::vm::database::{ClarityDatabase, MemoryBackingStore};
     use crate::vm::types::TupleData;
-    use crate::{types::chainstate::VRFSeed, vm::StacksEpoch};
-    use crate::{
-        types::chainstate::{BlockHeaderHash, BurnchainHeaderHash, ConsensusHash},
-        vm::database::{ClarityDatabase, MemoryBackingStore},
+    use crate::vm::StacksEpoch;
+    use stacks_common::address::AddressHashMode;
+    use stacks_common::types::chainstate::{
+        BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, VRFSeed,
     };
+    use stacks_common::types::chainstate::{SortitionId, StacksAddress, StacksBlockId};
+    use stacks_common::types::Address;
 
     use crate::vm::ast::ASTRules;
     use crate::vm::costs::ExecutionCost;