Fix conflicts

lambdaclass · Nov 4, 2024 · edafcff · edafcff
1 parent 7864534
commit edafcff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/core/node/da_clients/src/eigen/client.rs b/core/node/da_clients/src/eigen/client.rs
@@ -10,7 +10,7 @@ use zksync_da_client::{
     DataAvailabilityClient,
 };
 
-use super::{memstore::MemStore, sdk::RawEigenClient, Disperser,blob_info::BlobInfo};
+use super::{blob_info::BlobInfo, memstore::MemStore, sdk::RawEigenClient, Disperser};
 use crate::utils::to_non_retriable_da_error;
 
 #[derive(Debug, Clone)]
@@ -191,7 +191,14 @@ mod tests {
 
         let blob_info: BlobInfo =
             rlp::decode(&hex::decode(result.blob_id.clone()).unwrap()).unwrap();
-        // TODO: once get inclusion data is added, check it
+        let expected_inclusion_data = blob_info.blob_verification_proof.inclusion_proof;
+        let actual_inclusion_data = client
+            .get_inclusion_data(&result.blob_id)
+            .await
+            .unwrap()
+            .unwrap()
+            .data;
+        assert_eq!(expected_inclusion_data, actual_inclusion_data);
 
         let retrieved_data = client.get_blob_data(&result.blob_id).await.unwrap();
         assert_eq!(retrieved_data.unwrap(), data);

diff --git a/core/node/da_clients/src/eigen/memstore.rs b/core/node/da_clients/src/eigen/memstore.rs
@@ -11,10 +11,7 @@ use tokio::time::interval;
 use zksync_config::configs::da_client::eigen::MemStoreConfig;
 use zksync_da_client::types::{DAError, DispatchResponse, InclusionData};
 
-use super::{
-    blob_info::{self, BlobInfo},
-    client::to_retriable_error,
-};
+use super::blob_info::{self, BlobInfo};
 
 #[derive(Debug, PartialEq)]
 pub enum MemStoreError {