Merge branch 'feat/clarity-serialization-crate' into feat/move-clarity-serialization-to-root

Author: Jiloc

clarity-serialization/src/errors.rs

@@ -117,3 +117,13 @@ pub enum CodecError {
     #[error("An unexpected internal error occurred: {0}")]
     Expect(String),
 }
+
+// Implement PartialEq for testing and simple equality checks by comparing the
+// string representations of each error. This avoids requiring all wrapped
+// fields (like `std::io::Error`) to implement PartialEq.
+#[cfg(any(test, feature = "testing"))]
+impl PartialEq for CodecError {
+    fn eq(&self, other: &Self) -> bool {
+        self.to_string() == other.to_string()
+    }
+}

clarity-serialization/src/lib.rs

@@ -32,7 +32,7 @@ pub use errors::CodecError;
 pub use representations::{ClarityName, ContractName};
 pub use types::Value;
 
-#[cfg(any(test, feature = "testing"))]
+#[cfg(test)]
 pub mod tests;
 
 // set via _compile-time_ envars

clarity-serialization/src/tests/mod.rs

@@ -15,52 +15,7 @@
 mod representations;
 mod types;
 
-use stacks_common::address::{AddressHashMode, C32_ADDRESS_VERSION_TESTNET_SINGLESIG};
-use stacks_common::types::chainstate::{StacksAddress, StacksPrivateKey, StacksPublicKey};
-
-use crate::errors::CodecError;
-use crate::types::{PrincipalData, StandardPrincipalData, Value};
-use crate::{version_string, BUILD_TYPE};
-
-impl Value {
-    pub fn list_from(list_data: Vec<Value>) -> Result<Value, CodecError> {
-        Value::cons_list_unsanitized(list_data)
-    }
-}
-
-// Implement PartialEq for testing and simple equality checks by comparing the
-// string representations of each error. This avoids requiring all wrapped
-// fields (like `std::io::Error`) to implement PartialEq.
-impl PartialEq for CodecError {
-    fn eq(&self, other: &Self) -> bool {
-        self.to_string() == other.to_string()
-    }
-}
-
-impl From<&StacksPrivateKey> for StandardPrincipalData {
-    fn from(o: &StacksPrivateKey) -> StandardPrincipalData {
-        let stacks_addr = StacksAddress::from_public_keys(
-            C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
-            &AddressHashMode::SerializeP2PKH,
-            1,
-            &vec![StacksPublicKey::from_private(o)],
-        )
-        .unwrap();
-        StandardPrincipalData::from(stacks_addr)
-    }
-}
-
-impl From<&StacksPrivateKey> for PrincipalData {
-    fn from(o: &StacksPrivateKey) -> PrincipalData {
-        PrincipalData::Standard(StandardPrincipalData::from(o))
-    }
-}
-
-impl From<&StacksPrivateKey> for Value {
-    fn from(o: &StacksPrivateKey) -> Value {
-        Value::from(StandardPrincipalData::from(o))
-    }
-}
+use crate::{BUILD_TYPE, version_string};
 
 #[test]
 fn test_version_string_basic_no_env() {

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;
 

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() {

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()

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,
 };

clarity-serialization/src/types/mod.rs

@@ -860,6 +860,11 @@ impl Value {
         })))
     }
 
+    #[cfg(any(test, feature = "testing"))]
+    pub fn list_from(list_data: Vec<Value>) -> Result<Value, CodecError> {
+        Value::cons_list_unsanitized(list_data)
+    }
+
     pub fn cons_list(list_data: Vec<Value>, epoch: &StacksEpochId) -> Result<Value, CodecError> {
         // Constructors for TypeSignature ensure that the size of the Value cannot
         //   be greater than MAX_VALUE_SIZE (they error on such constructions)