fix(types): RowNamespaceData binary deserialization (#493)

eigerco · Dec 27, 2024 · 7fb26b8 · 7fb26b8
1 parent 35fac5a
commit 7fb26b8
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -45,6 +45,7 @@ time = { version = "0.3.36", default-features = false }
 ed25519-consensus = "2.1.0"
 rand = "0.8.5"
 serde_json = "1.0.117"
+bincode = "1.3.3"
 
 # doc-tests
 indoc = "2.0.5"

diff --git a/types/src/row_namespace_data.rs b/types/src/row_namespace_data.rs
@@ -41,7 +41,7 @@ pub struct RowNamespaceDataId {
 /// It is constructed out of the ExtendedDataSquare. If, for particular EDS, shares from the namespace span multiple rows,
 /// one needs multiple RowNamespaceData instances to cover the whole range.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(into = "RawRowNamespaceData")]
+#[serde(into = "RawRowNamespaceData", try_from = "RawRowNamespaceData")]
 pub struct RowNamespaceData {
     /// Proof of data inclusion
     pub proof: NamespaceProof,
@@ -172,6 +172,23 @@ impl From<RowNamespaceData> for RawRowNamespaceData {
     }
 }
 
+impl TryFrom<RawRowNamespaceData> for RowNamespaceData {
+    type Error = Error;
+
+    fn try_from(value: RawRowNamespaceData) -> std::result::Result<Self, Self::Error> {
+        let Some(proof) = value.proof else {
+            return Err(Error::MissingProof);
+        };
+        let proof = proof.try_into()?;
+
+        let mut shares = Vec::with_capacity(value.shares.len());
+        for raw_share in value.shares {
+            shares.push(Share::try_from(raw_share)?);
+        }
+        Ok(RowNamespaceData { proof, shares })
+    }
+}
+
 impl RowNamespaceDataId {
     /// Create a new [`RowNamespaceDataId`] for given block, row and the [`Namespace`].
     ///
@@ -458,4 +475,72 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn namespace_data_roundtrip() {
+        let proof = nmt_rs::nmt_proof::NamespaceProof::<
+            crate::nmt::NamespacedSha2Hasher,
+            { crate::nmt::NS_SIZE },
+        >::AbsenceProof {
+            proof: crate::nmt::Proof {
+                siblings: vec![
+                    nmt_rs::NamespacedHash::new(
+                        nmt_rs::NamespaceId([
+                            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                            0, 0, 0, 0, 4,
+                        ]),
+                        nmt_rs::NamespaceId([
+                            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                            0, 0, 0, 0, 4,
+                        ]),
+                        [
+                            180, 43, 29, 197, 134, 127, 103, 202, 217, 240, 11, 18, 15, 47, 140,
+                            136, 58, 134, 117, 174, 162, 95, 216, 114, 31, 71, 90, 238, 49, 228,
+                            95, 89,
+                        ],
+                    ),
+                    nmt_rs::NamespacedHash::new(
+                        nmt_rs::NamespaceId::MAX_ID,
+                        nmt_rs::NamespaceId::MAX_ID,
+                        [
+                            126, 112, 141, 49, 103, 177, 23, 186, 153, 245, 110, 62, 165, 4, 39,
+                            125, 171, 55, 116, 176, 36, 153, 101, 171, 25, 253, 200, 61, 226, 43,
+                            81, 52,
+                        ],
+                    ),
+                ],
+                range: 1..2,
+            },
+            ignore_max_ns: true,
+            leaf: Some(nmt_rs::NamespacedHash::new(
+                nmt_rs::NamespaceId([
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 111, 118, 45,
+                    116, 101, 115, 116, 45, 112,
+                ]),
+                nmt_rs::NamespaceId([
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 111, 118, 45,
+                    116, 101, 115, 116, 45, 112,
+                ]),
+                [
+                    132, 118, 183, 139, 217, 27, 43, 49, 209, 15, 142, 136, 209, 205, 230, 67, 247,
+                    102, 202, 206, 118, 16, 124, 41, 208, 225, 148, 103, 192, 184, 59, 155,
+                ],
+            )),
+        };
+
+        let row = RowNamespaceData {
+            proof: proof.into(),
+            shares: vec![],
+        };
+
+        // JSON works,
+        let row_j = serde_json::to_value(&row).unwrap();
+        let d_from_json: RowNamespaceData = serde_json::from_value(row_j).unwrap();
+        assert_eq!(d_from_json, row);
+
+        // And what about bincode?
+        let s_row = bincode::serialize(&row).unwrap();
+        let d_row: RowNamespaceData = bincode::deserialize(&s_row).unwrap();
+        assert_eq!(row, d_row);
+    }
 }