renaming

Author: distractedm1nd

crates/prism/src/da/celestia.rs

@@ -1,9 +1,8 @@
 use crate::{
     cfg::CelestiaConfig,
-    consts::CHANNEL_BUFFER_SIZE,
     da::{DataAvailabilityLayer, FinalizedEpoch},
 };
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
 use celestia_rpc::{BlobClient, Client, HeaderClient};
 use celestia_types::{blob::GasPrice, nmt::Namespace, Blob};
@@ -99,7 +98,7 @@ impl DataAvailabilityLayer for CelestiaConnection {
         Ok(height)
     }
 
-    async fn get_snark(&self, height: u64) -> Result<Option<FinalizedEpoch>> {
+    async fn get_finalized_epoch(&self, height: u64) -> Result<Option<FinalizedEpoch>> {
         trace!("searching for epoch on da layer at height {}", height);
 
         match BlobClient::blob_get_all(&self.client, height, &[self.snark_namespace]).await {
@@ -128,7 +127,7 @@ impl DataAvailabilityLayer for CelestiaConnection {
         }
     }
 
-    async fn submit_snark(&self, epoch: FinalizedEpoch) -> Result<u64> {
+    async fn submit_finalized_epoch(&self, epoch: FinalizedEpoch) -> Result<u64> {
         debug!("posting {}th epoch to da layer", epoch.height);
 
         let data = bincode::serialize(&epoch).map_err(|e| {

crates/prism/src/da/memory.rs

@@ -92,7 +92,7 @@ impl DataAvailabilityLayer for InMemoryDataAvailabilityLayer {
         self.get_latest_height().await
     }
 
-    async fn get_snark(&self, height: u64) -> Result<Option<FinalizedEpoch>> {
+    async fn get_finalized_epoch(&self, height: u64) -> Result<Option<FinalizedEpoch>> {
         let blocks = self.blocks.read().await;
         Ok(blocks
             .iter()
@@ -101,7 +101,7 @@ impl DataAvailabilityLayer for InMemoryDataAvailabilityLayer {
             .unwrap_or_default())
     }
 
-    async fn submit_snark(&self, epoch: FinalizedEpoch) -> Result<u64> {
+    async fn submit_finalized_epoch(&self, epoch: FinalizedEpoch) -> Result<u64> {
         let mut pending_epochs = self.pending_epochs.write().await;
         pending_epochs.push_back(epoch);
         self.get_latest_height().await

crates/prism/src/da/mod.rs

@@ -51,8 +51,8 @@ impl SignedContent for FinalizedEpoch {
 pub trait DataAvailabilityLayer: Send + Sync {
     async fn get_latest_height(&self) -> Result<u64>;
     async fn initialize_sync_target(&self) -> Result<u64>;
-    async fn get_snark(&self, height: u64) -> Result<Option<FinalizedEpoch>>;
-    async fn submit_snark(&self, epoch: FinalizedEpoch) -> Result<u64>;
+    async fn get_finalized_epoch(&self, height: u64) -> Result<Option<FinalizedEpoch>>;
+    async fn submit_finalized_epoch(&self, epoch: FinalizedEpoch) -> Result<u64>;
     async fn get_operations(&self, height: u64) -> Result<Vec<Operation>>;
     async fn submit_operations(&self, operations: Vec<Operation>) -> Result<u64>;
     async fn start(&self) -> Result<()>;

crates/prism/src/node_types/sequencer.rs

@@ -121,7 +121,7 @@ impl Sequencer {
         while current_height < end_height {
             let height = current_height + 1;
             let operations = self.da.get_operations(height).await?;
-            let epoch_result = self.da.get_snark(height).await?;
+            let epoch_result = self.da.get_finalized_epoch(height).await?;
 
             self.process_height(
                 height,
@@ -188,7 +188,7 @@ impl Sequencer {
         loop {
             let height = height_rx.recv().await?;
             let operations = self.da.get_operations(height).await?;
-            let epoch_result = self.da.get_snark(height).await?;
+            let epoch_result = self.da.get_finalized_epoch(height).await?;
 
             self.process_height(
                 height,
@@ -320,7 +320,7 @@ impl Sequencer {
             .prove_epoch(height, prev_commitment, new_commitment, proofs)
             .await?;
 
-        self.da.submit_snark(finalized_epoch).await?;
+        self.da.submit_finalized_epoch(finalized_epoch).await?;
 
         self.db.set_commitment(&height, &new_commitment)?;
         self.db.set_epoch(&height)?;

crates/prism/src/storage.rs

@@ -14,7 +14,7 @@ use std::{
     time::Duration,
 };
 
-use crate::{cfg::RedisConfig, da::FinalizedEpoch};
+use crate::cfg::RedisConfig;
 use prism_common::{
     hashchain::{Hashchain, HashchainEntry},
     operation::Operation,

crates/prism/tests/integration_tests.rs

@@ -6,13 +6,12 @@ use keystore_rs::create_signing_key;
 use prism_common::operation::{AccountSource, Operation};
 use prism_main::{
     cfg::{Config, RedisConfig},
-    da::{memory::InMemoryDataAvailabilityLayer, DataAvailabilityLayer},
+    da::memory::InMemoryDataAvailabilityLayer,
     node_types::{lightclient::LightClient, sequencer::Sequencer, NodeType},
     storage::{Database, RedisConnection},
     webserver::OperationInput,
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
-use serde_json;
 use std::sync::Arc;
 use tokio::{spawn, time::Duration};