Factored functions and test data into the test_helpers module.

crates/node/src/crypto.rs

@@ -266,14 +266,7 @@ fn decrypt_slice(ciphertext: &[u8], key: &Key) -> Result<Vec<u8>> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use super::serde_tests::{
-        make_principal,
-        make_block,
-        KEY,
-        BLOCK_KEY,
-        IV,
-        BLOCK_IV,
-    };
+    use test_helpers::*;
 
     #[test]
     fn key_aes256cbc_key_slice_is_correct() -> Result<()> {

crates/node/src/main.rs

@@ -11,6 +11,9 @@ use std::{
 use serde::{Serialize, Deserialize};
 use serde_big_array::BigArray;
 
+#[cfg(test)]
+mod test_helpers;
+
 #[cfg(test)]
 mod serde_tests;
 

crates/node/src/serde_tests.rs

@@ -1,102 +1,9 @@
 /// Tests which ensure that the main data structures can be round-tripped faithfully.
 
 use super::*;
-use crypto::{Hash, Signature, Key};
+use crypto::Hash;
 use serde_block_tree::{Error, Result, from_vec, to_vec};
-
-pub const PRINCIPAL: [u8; 32] = [
-    0x75, 0x28, 0xA9, 0xE0, 0x9D, 0x24, 0xBA, 0xB3, 0x79, 0x56, 0x15, 0x68, 0xFD, 0xA4, 0xE2, 0xA4,
-    0xCF, 0xB2, 0xC0, 0xE3, 0x96, 0xAE, 0xA2, 0x6E, 0x45, 0x15, 0x50, 0xED, 0xA6, 0xBE, 0x6D, 0xEC,
-];
-
-pub const PAYLOAD: [u8; 128] = [
-    0x39, 0x79, 0x1A, 0x0D, 0x8E, 0x6C, 0xF5, 0x4B, 0xF3, 0xA4, 0x75, 0xC4, 0x44, 0x73, 0x58, 0x58,
-    0x97, 0x14, 0x64, 0xE0, 0xC6, 0xFE, 0xCB, 0xCF, 0xBE, 0x67, 0x49, 0x49, 0x40, 0xAE, 0x71, 0x5A,
-    0x94, 0x7E, 0x6C, 0x4B, 0xDE, 0x33, 0x22, 0x75, 0xD8, 0x54, 0x23, 0x37, 0xFD, 0x1A, 0x68, 0x4A,
-    0x5F, 0xB5, 0xB3, 0xC9, 0x9A, 0x72, 0x7C, 0xF4, 0x3C, 0xAB, 0xED, 0x97, 0x87, 0x63, 0xBB, 0xD9,
-    0x8B, 0x11, 0xD3, 0xC1, 0x4C, 0x9A, 0x09, 0x0E, 0x7C, 0x10, 0x65, 0x9B, 0x8F, 0x35, 0xEB, 0x51,
-    0x19, 0xD7, 0x6E, 0xA3, 0xC9, 0x64, 0xE2, 0x54, 0x84, 0x5F, 0xA1, 0x8B, 0x63, 0x0C, 0xC3, 0x9D,
-    0xBE, 0xBB, 0x7F, 0x31, 0x1D, 0x59, 0xE2, 0x68, 0xC4, 0x5B, 0x37, 0x77, 0x04, 0xAD, 0x44, 0x75,
-    0xEE, 0x1F, 0x84, 0x17, 0xA2, 0x74, 0xC3, 0xC3, 0xD5, 0x2F, 0x70, 0x74, 0xFE, 0xD8, 0x2C, 0x29,
-];
-
-pub const SIGNATURE: [u8; 64] = [
-    0x2E, 0x19, 0x8E, 0xCC, 0x2D, 0xE1, 0x0E, 0x42, 0x3F, 0xBB, 0x89, 0x3D, 0x07, 0xAB, 0x57, 0xBF,
-    0xEB, 0xB1, 0xA7, 0x23, 0xF9, 0xD2, 0xC3, 0x3F, 0x7A, 0x3C, 0xD0, 0x31, 0x38, 0x01, 0x33, 0x1F,
-    0x07, 0x8D, 0x68, 0x0C, 0x6B, 0xF1, 0xBA, 0xD3, 0xD4, 0xAE, 0xAD, 0x1A, 0xF7, 0x5D, 0x2C, 0xEF,
-    0x1F, 0x5C, 0x50, 0xE9, 0xFA, 0x8A, 0xDB, 0xB2, 0x4C, 0xC6, 0x9B, 0x06, 0x5F, 0xFB, 0xE3, 0xDA,
-];
-
-pub const KEY: [u8; 32] = [
-    0xB2, 0xB3, 0xDA, 0x5A, 0x1A, 0xF6, 0xB3, 0x78, 0x30, 0xAB, 0x1D, 0x33, 0x33, 0xE7, 0xE3, 0x5B,
-    0xBB, 0xF9, 0xFE, 0xD0, 0xC1, 0xF7, 0x90, 0x34, 0x69, 0xB7, 0xE7, 0xC6, 0x1C, 0x46, 0x85, 0x48,
-];
-
-pub const BLOCK_KEY: [u8; 32] = [
-    0xEE, 0x76, 0xD6, 0xDC, 0x6D, 0x94, 0x1D, 0x95, 0xC2, 0x57, 0x94, 0x46, 0xA2, 0x97, 0x8F, 0x5B,
-    0x59, 0xE1, 0x7E, 0xE4, 0x3B, 0xB1, 0x69, 0x88, 0x5D, 0x16, 0x30, 0x5A, 0x50, 0xDB, 0x58, 0x65,
-];
-
-pub const LONG_KEY: [u8; 64] = [
-    0x65, 0x4E, 0x78, 0x5C, 0x8E, 0xEE, 0x9E, 0x57, 0x58, 0x8D, 0xDE, 0x9E, 0x6D, 0x84, 0xF4, 0x68,
-    0x7F, 0x9E, 0x48, 0xC4, 0x6F, 0x1F, 0x4F, 0x83, 0x46, 0x68, 0xB2, 0xC1, 0x46, 0xD0, 0x06, 0xF2,
-    0x23, 0xB9, 0xD4, 0x66, 0x4B, 0xED, 0x65, 0x92, 0xF1, 0xA2, 0x04, 0x1A, 0xD9, 0xF6, 0xA2, 0xAE,
-    0x87, 0x3E, 0xBF, 0x10, 0x4A, 0x29, 0x28, 0x83, 0x2A, 0x8F, 0xC5, 0x30, 0x86, 0x11, 0x48, 0x52,
-];
-
-pub const IV: [u8; 16] = [
-    0x60, 0xE0, 0xBE, 0x45, 0xA9, 0xAB, 0x5D, 0x99, 0x3B, 0x3A, 0x1E, 0x54, 0x18, 0xE0, 0x46, 0xDE,
-];
-
-pub const BLOCK_IV: [u8; 16] = [
-    0xF2, 0xB5, 0x64, 0xF3, 0x82, 0xC6, 0xEC, 0x1E, 0x35, 0xAA, 0x34, 0xD1, 0x40, 0xA3, 0xA8, 0xB3,
-];
-
-pub(crate) fn make_principal() -> Principal {
-    Principal(Hash::Sha2_256(PRINCIPAL))
-}
-
-pub(crate) fn make_write_cap() -> Result<WriteCap> {
-    Ok(WriteCap {
-        issued_to: Principal(Hash::Sha2_256(PRINCIPAL)),
-        issued_by: Principal(Hash::Sha2_256(PRINCIPAL)),
-        path: Path::try_from("contacts/emergency").map_err(|err| Error::Message(err.to_string()))?,
-        expires: Epoch(1649904316),
-        signing_key: Key::Ed25519 { public: KEY, private: None },
-        signature: Signature::Ed25519(SIGNATURE),
-        next: Some(Box::from(WriteCap {
-            issued_to: Principal(Hash::Sha2_256(PRINCIPAL)),
-            issued_by: Principal(Hash::Sha2_256(PRINCIPAL)),
-            path: Path::try_from("contacts").map_err(|err| Error::Message(err.to_string()))?,
-            expires: Epoch(1649994316),
-            signing_key: Key::Ed25519 { public: KEY, private: None },
-            signature: Signature::Ed25519(SIGNATURE),
-            next: None,
-        }))
-    })
-}
-
-pub(crate) fn make_read_cap() -> ReadCap {
-    ReadCap::new(
-        Hash::Sha2_256(PRINCIPAL), Cryptotext::Plain(Key::Aes256Ctr { key: KEY, iv: IV })
-    )
-}
-
-pub(crate) fn make_block() -> Result<Block> {
-    let mut read_caps = HashMap::new();
-    {
-        let read_cap = make_read_cap();
-        read_caps.insert(read_cap.issued_to, read_cap.key);
-    }
-    let write_cap = make_write_cap()?;
-    Ok(Block {
-        path: Path::try_from("apps/verse").map_err(|err| Error::Message(err.to_string()))?,
-        read_caps,
-        write_cap,
-        body: Cryptotext::Plain(Vec::from(PAYLOAD)),
-        signature: Signature::Ed25519(SIGNATURE)
-    })
-}
+use test_helpers::*;
 
 #[test]
 fn roundtrip_fragment_record() -> Result<()> {

crates/node/src/test_helpers.rs

@@ -0,0 +1,98 @@
+/// Test data and functions to help with testing.
+
+use super::*;
+use serde_block_tree::{Error, Result};
+
+pub const PRINCIPAL: [u8; 32] = [
+    0x75, 0x28, 0xA9, 0xE0, 0x9D, 0x24, 0xBA, 0xB3, 0x79, 0x56, 0x15, 0x68, 0xFD, 0xA4, 0xE2, 0xA4,
+    0xCF, 0xB2, 0xC0, 0xE3, 0x96, 0xAE, 0xA2, 0x6E, 0x45, 0x15, 0x50, 0xED, 0xA6, 0xBE, 0x6D, 0xEC,
+];
+
+pub const PAYLOAD: [u8; 128] = [
+    0x39, 0x79, 0x1A, 0x0D, 0x8E, 0x6C, 0xF5, 0x4B, 0xF3, 0xA4, 0x75, 0xC4, 0x44, 0x73, 0x58, 0x58,
+    0x97, 0x14, 0x64, 0xE0, 0xC6, 0xFE, 0xCB, 0xCF, 0xBE, 0x67, 0x49, 0x49, 0x40, 0xAE, 0x71, 0x5A,
+    0x94, 0x7E, 0x6C, 0x4B, 0xDE, 0x33, 0x22, 0x75, 0xD8, 0x54, 0x23, 0x37, 0xFD, 0x1A, 0x68, 0x4A,
+    0x5F, 0xB5, 0xB3, 0xC9, 0x9A, 0x72, 0x7C, 0xF4, 0x3C, 0xAB, 0xED, 0x97, 0x87, 0x63, 0xBB, 0xD9,
+    0x8B, 0x11, 0xD3, 0xC1, 0x4C, 0x9A, 0x09, 0x0E, 0x7C, 0x10, 0x65, 0x9B, 0x8F, 0x35, 0xEB, 0x51,
+    0x19, 0xD7, 0x6E, 0xA3, 0xC9, 0x64, 0xE2, 0x54, 0x84, 0x5F, 0xA1, 0x8B, 0x63, 0x0C, 0xC3, 0x9D,
+    0xBE, 0xBB, 0x7F, 0x31, 0x1D, 0x59, 0xE2, 0x68, 0xC4, 0x5B, 0x37, 0x77, 0x04, 0xAD, 0x44, 0x75,
+    0xEE, 0x1F, 0x84, 0x17, 0xA2, 0x74, 0xC3, 0xC3, 0xD5, 0x2F, 0x70, 0x74, 0xFE, 0xD8, 0x2C, 0x29,
+];
+
+pub const SIGNATURE: [u8; 64] = [
+    0x2E, 0x19, 0x8E, 0xCC, 0x2D, 0xE1, 0x0E, 0x42, 0x3F, 0xBB, 0x89, 0x3D, 0x07, 0xAB, 0x57, 0xBF,
+    0xEB, 0xB1, 0xA7, 0x23, 0xF9, 0xD2, 0xC3, 0x3F, 0x7A, 0x3C, 0xD0, 0x31, 0x38, 0x01, 0x33, 0x1F,
+    0x07, 0x8D, 0x68, 0x0C, 0x6B, 0xF1, 0xBA, 0xD3, 0xD4, 0xAE, 0xAD, 0x1A, 0xF7, 0x5D, 0x2C, 0xEF,
+    0x1F, 0x5C, 0x50, 0xE9, 0xFA, 0x8A, 0xDB, 0xB2, 0x4C, 0xC6, 0x9B, 0x06, 0x5F, 0xFB, 0xE3, 0xDA,
+];
+
+pub const KEY: [u8; 32] = [
+    0xB2, 0xB3, 0xDA, 0x5A, 0x1A, 0xF6, 0xB3, 0x78, 0x30, 0xAB, 0x1D, 0x33, 0x33, 0xE7, 0xE3, 0x5B,
+    0xBB, 0xF9, 0xFE, 0xD0, 0xC1, 0xF7, 0x90, 0x34, 0x69, 0xB7, 0xE7, 0xC6, 0x1C, 0x46, 0x85, 0x48,
+];
+
+pub const BLOCK_KEY: [u8; 32] = [
+    0xEE, 0x76, 0xD6, 0xDC, 0x6D, 0x94, 0x1D, 0x95, 0xC2, 0x57, 0x94, 0x46, 0xA2, 0x97, 0x8F, 0x5B,
+    0x59, 0xE1, 0x7E, 0xE4, 0x3B, 0xB1, 0x69, 0x88, 0x5D, 0x16, 0x30, 0x5A, 0x50, 0xDB, 0x58, 0x65,
+];
+
+pub const LONG_KEY: [u8; 64] = [
+    0x65, 0x4E, 0x78, 0x5C, 0x8E, 0xEE, 0x9E, 0x57, 0x58, 0x8D, 0xDE, 0x9E, 0x6D, 0x84, 0xF4, 0x68,
+    0x7F, 0x9E, 0x48, 0xC4, 0x6F, 0x1F, 0x4F, 0x83, 0x46, 0x68, 0xB2, 0xC1, 0x46, 0xD0, 0x06, 0xF2,
+    0x23, 0xB9, 0xD4, 0x66, 0x4B, 0xED, 0x65, 0x92, 0xF1, 0xA2, 0x04, 0x1A, 0xD9, 0xF6, 0xA2, 0xAE,
+    0x87, 0x3E, 0xBF, 0x10, 0x4A, 0x29, 0x28, 0x83, 0x2A, 0x8F, 0xC5, 0x30, 0x86, 0x11, 0x48, 0x52,
+];
+
+pub const IV: [u8; 16] = [
+    0x60, 0xE0, 0xBE, 0x45, 0xA9, 0xAB, 0x5D, 0x99, 0x3B, 0x3A, 0x1E, 0x54, 0x18, 0xE0, 0x46, 0xDE,
+];
+
+pub const BLOCK_IV: [u8; 16] = [
+    0xF2, 0xB5, 0x64, 0xF3, 0x82, 0xC6, 0xEC, 0x1E, 0x35, 0xAA, 0x34, 0xD1, 0x40, 0xA3, 0xA8, 0xB3,
+];
+
+pub(crate) fn make_principal() -> Principal {
+    Principal(Hash::Sha2_256(PRINCIPAL))
+}
+
+pub(crate) fn make_write_cap() -> Result<WriteCap> {
+    Ok(WriteCap {
+        issued_to: Principal(Hash::Sha2_256(PRINCIPAL)),
+        issued_by: Principal(Hash::Sha2_256(PRINCIPAL)),
+        path: Path::try_from("contacts/emergency").map_err(|err| Error::Message(err.to_string()))?,
+        expires: Epoch(1649904316),
+        signing_key: Key::Ed25519 { public: KEY, private: None },
+        signature: Signature::Ed25519(SIGNATURE),
+        next: Some(Box::from(WriteCap {
+            issued_to: Principal(Hash::Sha2_256(PRINCIPAL)),
+            issued_by: Principal(Hash::Sha2_256(PRINCIPAL)),
+            path: Path::try_from("contacts").map_err(|err| Error::Message(err.to_string()))?,
+            expires: Epoch(1649994316),
+            signing_key: Key::Ed25519 { public: KEY, private: None },
+            signature: Signature::Ed25519(SIGNATURE),
+            next: None,
+        }))
+    })
+}
+
+pub(crate) fn make_read_cap() -> ReadCap {
+    ReadCap::new(
+        Hash::Sha2_256(PRINCIPAL), Cryptotext::Plain(Key::Aes256Ctr { key: KEY, iv: IV })
+    )
+}
+
+pub(crate) fn make_block() -> Result<Block> {
+    let mut read_caps = HashMap::new();
+    {
+        let read_cap = make_read_cap();
+        read_caps.insert(read_cap.issued_to, read_cap.key);
+    }
+    let write_cap = make_write_cap()?;
+    Ok(Block {
+        path: Path::try_from("apps/verse").map_err(|err| Error::Message(err.to_string()))?,
+        read_caps,
+        write_cap,
+        body: Cryptotext::Plain(Vec::from(PAYLOAD)),
+        signature: Signature::Ed25519(SIGNATURE)
+    })
+}