feat: enable clarity-serialization in cargo workspace

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
-clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
+clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity-serialization -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
 clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
 
 # Uncomment to improve performance slightly, at the cost of portability

Cargo.toml

@@ -4,6 +4,7 @@ members = [
     "stackslib",
     "stacks-common",
     "pox-locking",
+    "clarity-serialization",
     "clarity",
     "stx-genesis",
     "libstackerdb",
@@ -12,8 +13,6 @@ members = [
     "stacks-node",
     "contrib/tools/config-docs-generator"]
 
-exclude = ["contrib/clarity-serialization"]
-
 # Dependencies we want to keep the same between workspace members
 [workspace.dependencies]
 ed25519-dalek = { version = "2.1.1", default-features = false }

contrib/clarity-serialization/Cargo.toml → clarity-serialization/Cargo.toml

@@ -10,13 +10,13 @@ keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized"
 readme = "README.md"
 
 [dependencies]
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
 regex = { version = "1", default-features = false }
-serde = { version = "1", features = ["derive"] }
-serde_derive = { version = "1" }
-slog = { version = "2.5.2", features = [ "max_level_trace" ] }
-stacks_common = { package = "stacks-common", path = "../../stacks-common", default-features = false }
-thiserror = { version = "1.0.65" }
+serde = { workspace = true }
+serde_derive = { workspace = true }
+slog = { workspace = true }
+stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 mutants = "0.0.3"

contrib/clarity-serialization/src/tests/representations.rs → clarity-serialization/src/tests/representations.rs

@@ -18,7 +18,7 @@ use test_case::test_case;
 
 use crate::errors::CodecError;
 use crate::representations::{
-    ClarityName, ContractName, CONTRACT_MAX_NAME_LENGTH, CONTRACT_MIN_NAME_LENGTH, MAX_STRING_LEN,
+    CONTRACT_MAX_NAME_LENGTH, CONTRACT_MIN_NAME_LENGTH, ClarityName, ContractName, MAX_STRING_LEN,
 };
 use crate::stacks_common::codec::StacksMessageCodec;
 

contrib/clarity-serialization/src/tests/types/mod.rs → clarity-serialization/src/tests/types/mod.rs

@@ -17,11 +17,11 @@ mod signatures;
 
 use stacks_common::types::StacksEpochId;
 
+use crate::CodecError;
 use crate::types::{
-    BuffData, ListTypeData, PrincipalData, SequenceData, TupleData, TypeSignature, Value,
-    MAX_VALUE_SIZE,
+    BuffData, ListTypeData, MAX_VALUE_SIZE, PrincipalData, SequenceData, TupleData, TypeSignature,
+    Value,
 };
-use crate::CodecError;
 
 #[test]
 fn test_constructors() {

contrib/clarity-serialization/src/tests/types/serialization.rs → clarity-serialization/src/tests/types/serialization.rs

@@ -16,8 +16,8 @@ use std::io::Write;
 
 use crate::errors::CodecError;
 use crate::types::{
-    PrincipalData, QualifiedContractIdentifier, StandardPrincipalData, TupleData, TypeSignature,
-    Value, MAX_VALUE_SIZE,
+    MAX_VALUE_SIZE, PrincipalData, QualifiedContractIdentifier, StandardPrincipalData, TupleData,
+    TypeSignature, Value,
 };
 
 fn test_deser_ser(v: Value) {
@@ -51,12 +51,9 @@ fn test_bad_expectation(v: Value, e: TypeSignature) {
 
 #[test]
 fn test_lists() {
-    let list_list_int = Value::list_from(vec![Value::list_from(vec![
-        Value::Int(1),
-        Value::Int(2),
-        Value::Int(3),
+    let list_list_int = Value::list_from(vec![
+        Value::list_from(vec![Value::Int(1), Value::Int(2), Value::Int(3)]).unwrap(),
     ])
-    .unwrap()])
     .unwrap();
     test_deser_ser(list_list_int.clone());
     test_deser_ser(Value::list_from(vec![]).unwrap());
@@ -290,8 +287,8 @@ fn test_vectors() {
             Ok(StandardPrincipalData::new(
                 0x00,
                 [
-                    0x11, 0xde, 0xad, 0xbe, 0xef, 0x11, 0xab, 0xab, 0xff, 0xff, 0x11, 0xde,
-                    0xad, 0xbe, 0xef, 0x11, 0xab, 0xab, 0xff, 0xff,
+                    0x11, 0xde, 0xad, 0xbe, 0xef, 0x11, 0xab, 0xab, 0xff, 0xff, 0x11, 0xde, 0xad,
+                    0xbe, 0xef, 0x11, 0xab, 0xab, 0xff, 0xff,
                 ],
             )
             .unwrap()

contrib/clarity-serialization/src/tests/types/signatures.rs → clarity-serialization/src/tests/types/signatures.rs

@@ -15,8 +15,8 @@
 use std::collections::HashSet;
 
 use crate::errors::CodecError;
-use crate::types::signatures::{CallableSubtype, TypeSignature};
 use crate::types::TypeSignature::{BoolType, IntType, ListUnionType, UIntType};
+use crate::types::signatures::{CallableSubtype, TypeSignature};
 use crate::types::{
     QualifiedContractIdentifier, SequenceSubtype, TraitIdentifier, TupleTypeSignature,
 };