move testing utilities to their own modules

Author: Jiloc

contrib/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()
+    }
+}

contrib/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

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

contrib/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)