rework a bit after review

eigerco · Jan 8, 2024 · f66ab21 · f66ab21
1 parent bf21388
commit f66ab21
Show file tree

Hide file tree

Showing 9 changed files with 221 additions and 204 deletions.
diff --git a/rpc/tests/share.rs b/rpc/tests/share.rs
@@ -6,7 +6,7 @@ use celestia_types::consts::appconsts::{
     SHARE_INFO_BYTES,
 };
 use celestia_types::nmt::{Namespace, NamespacedSha2Hasher, Nmt};
-use celestia_types::{Blob, Share};
+use celestia_types::Blob;
 use nmt_rs::NamespaceMerkleHasher;
 
 pub mod utils;
@@ -158,12 +158,12 @@ async fn get_eds() {
         for (x, leaf) in chunk.iter().enumerate() {
             if x < width / 2 && y < width / 2 {
                 // the `OriginalDataSquare` part of the `EDS`
-                let share = Share::from_raw(leaf).unwrap();
-                let ns = share.namespace();
-                nmt.push_leaf(share.as_ref(), *ns).unwrap();
+                let ns = leaf.namespace();
+                nmt.push_leaf(leaf.as_ref(), *ns).unwrap();
             } else {
                 // the parity data computed using `eds.codec`
-                nmt.push_leaf(leaf, *Namespace::PARITY_SHARE).unwrap();
+                nmt.push_leaf(leaf.as_ref(), *Namespace::PARITY_SHARE)
+                    .unwrap();
             }
         }
 

diff --git a/types/src/byzantine.rs b/types/src/byzantine.rs
@@ -7,12 +7,12 @@ use tendermint_proto::Protobuf;
 
 use crate::bail_validation;
 use crate::consts::appconsts;
-use crate::extended_data_square::AxisType;
 use crate::fraud_proof::FraudProof;
 use crate::nmt::{
     Namespace, NamespaceProof, NamespacedHash, NamespacedHashExt, NMT_CODEC, NMT_ID_SIZE,
     NMT_MULTIHASH_CODE, NS_SIZE,
 };
+use crate::rsmt2d::AxisType;
 use crate::{Error, ExtendedHeader, Result, Share};
 
 type Cid = CidGeneric<NMT_ID_SIZE>;

diff --git a/types/src/data_availability_header.rs b/types/src/data_availability_header.rs
@@ -7,9 +7,9 @@ use tendermint_proto::Protobuf;
 use crate::consts::data_availability_header::{
     MAX_EXTENDED_SQUARE_WIDTH, MIN_EXTENDED_SQUARE_WIDTH,
 };
-use crate::extended_data_square::AxisType;
 use crate::hash::Hash;
 use crate::nmt::{NamespacedHash, NamespacedHashExt};
+use crate::rsmt2d::AxisType;
 use crate::{bail_validation, Error, Result, ValidateBasic, ValidationError};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

diff --git a/types/src/extended_data_square.rs b/types/src/extended_data_square.rs
diff --git a/types/src/lib.rs b/types/src/lib.rs
@@ -4,7 +4,6 @@ mod byzantine;
 pub mod consts;
 mod data_availability_header;
 mod error;
-mod extended_data_square;
 mod extended_header;
 pub mod fraud_proof;
 pub mod hash;

diff --git a/types/src/namespaced_data.rs b/types/src/namespaced_data.rs
@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use tendermint_proto::Protobuf;
 
-use crate::extended_data_square::AxisType;
 use crate::nmt::{Namespace, NamespaceProof, NamespacedHashExt, HASH_SIZE, NS_SIZE};
+use crate::rsmt2d::AxisType;
 use crate::{DataAvailabilityHeader, Error, Result, Share};
 
 const NAMESPACED_DATA_ID_SIZE: usize = NamespacedDataId::size();
@@ -26,6 +26,10 @@ pub struct NamespacedDataId {
     pub block_height: u64,
 }
 
+/// `NamespacedData` is constructed out of the ExtendedDataSquare, containing up to a row of
+/// shares belonging to a particular namespace and a proof of their inclusion. If, for
+/// particular EDS, shares from the namespace span multiple rows, one needs multiple
+/// NamespacedData instances to cover the whole range.
 #[derive(Serialize, Deserialize, Clone)]
 #[serde(try_from = "RawNamespacedData", into = "RawNamespacedData")]
 pub struct NamespacedData {