[Refactor] Refactor of Clarity storage (iteration 1)

clarity/Cargo.toml

@@ -31,21 +31,26 @@ stacks_common = { package = "stacks-common", path = "../stacks-common" }
 rstest = "0.17.0"
 rstest_reuse = "0.5.0"
 hashbrown = { workspace = true }
+lru = "0.12.2"
+lz4_flex = "0.11.2"
+speedy = "0.8.7"
+fake = { version = "2.9.2", features = ["derive"] }
 
 [dependencies.serde_json]
 version = "1.0"
 features = ["arbitrary_precision", "unbounded_depth"]
 
 [dependencies.rusqlite]
 version = "=0.24.2"
-features = ["blob", "serde_json", "i128_blob", "bundled", "trace"]
+features = ["blob", "serde_json", "i128_blob", "bundled", "trace", "array"]
 
 [dependencies.time]
 version = "0.2.23"
 features = ["std"]
 
 [dev-dependencies]
 assert-json-diff = "1.0.0"
+randomizer = "0.1.2"
 # a nightly rustc regression (35dbef235 2021-03-02) prevents criterion from compiling
 #  but it isn't necessary for tests: only benchmarks. therefore, commenting out for now.
 # criterion = "0.3"

clarity/src/vm/analysis/arithmetic_checker/mod.rs

@@ -19,7 +19,6 @@ use hashbrown::HashMap;
 pub use super::errors::{
     check_argument_count, check_arguments_at_least, CheckError, CheckErrors, CheckResult,
 };
-use super::AnalysisDatabase;
 use crate::vm::analysis::types::{AnalysisPass, ContractAnalysis};
 use crate::vm::functions::define::{DefineFunctions, DefineFunctionsParsed};
 use crate::vm::functions::{tuples, NativeFunctions};

clarity/src/vm/analysis/contract_interface_builder/mod.rs

@@ -16,6 +16,7 @@
 
 use std::collections::{BTreeMap, BTreeSet};
 
+use speedy::{Readable, Writable};
 use stacks_common::types::StacksEpochId;
 
 use crate::vm::analysis::types::ContractAnalysis;
@@ -105,21 +106,21 @@ pub fn build_contract_interface(
     Ok(contract_interface)
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub enum ContractInterfaceFunctionAccess {
     private,
     public,
     read_only,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceTupleEntryType {
     pub name: String,
     #[serde(rename = "type")]
     pub type_f: ContractInterfaceAtomType,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub enum ContractInterfaceAtomType {
     none,
     int128,
@@ -151,12 +152,12 @@ pub enum ContractInterfaceAtomType {
     trait_reference,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceFungibleTokens {
     pub name: String,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceNonFungibleTokens {
     pub name: String,
     #[serde(rename = "type")]
@@ -228,7 +229,7 @@ impl ContractInterfaceAtomType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceFunctionArg {
     pub name: String,
     #[serde(rename = "type")]
@@ -247,13 +248,13 @@ impl ContractInterfaceFunctionArg {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceFunctionOutput {
     #[serde(rename = "type")]
     pub type_f: ContractInterfaceAtomType,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceFunction {
     pub name: String,
     pub access: ContractInterfaceFunctionAccess,
@@ -301,13 +302,13 @@ impl ContractInterfaceFunction {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub enum ContractInterfaceVariableAccess {
     constant,
     variable,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceVariable {
     pub name: String,
     #[serde(rename = "type")]
@@ -353,7 +354,7 @@ impl ContractInterfaceVariable {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterfaceMap {
     pub name: String,
     pub key: ContractInterfaceAtomType,
@@ -374,7 +375,7 @@ impl ContractInterfaceMap {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Writable, Readable)]
 pub struct ContractInterface {
     pub functions: Vec<ContractInterfaceFunction>,
     pub variables: Vec<ContractInterfaceVariable>,