Remove todo macros

Author: elmattic

src/chain/store/chain_store.rs

@@ -761,7 +761,7 @@ mod tests {
             db.clone(),
             db.clone(),
             db.clone(),
-            todo!(),
+            db,
             chain_config,
             gen_block.clone(),
         )
@@ -783,7 +783,7 @@ mod tests {
             db.clone(),
             db.clone(),
             db.clone(),
-            todo!(),
+            db,
             chain_config,
             gen_block,
         )

src/daemon/context.rs

@@ -10,7 +10,7 @@ use crate::daemon::db_util::load_all_forest_cars;
 use crate::db::car::ManyCar;
 use crate::db::db_engine::{db_root, open_db};
 use crate::db::parity_db::ParityDb;
-use crate::db::{DummyStore, EthMappingsStore, IndicesStore, CAR_DB_DIR_NAME};
+use crate::db::{DummyStore, EthMappingsStore, CAR_DB_DIR_NAME};
 use crate::genesis::read_genesis_header;
 use crate::libp2p::{Keypair, PeerId};
 use crate::networks::ChainConfig;

src/db/gc/mod.rs

@@ -286,7 +286,7 @@ mod test {
                     db.clone(),
                     db.clone(),
                     db.clone(),
-                    todo!(),
+                    db.clone(),
                     Arc::new(config),
                     gen_block,
                 )

src/db/memory.rs

@@ -22,6 +22,7 @@ pub struct MemoryDB {
     blockchain_persistent_db: RwLock<HashMap<Cid, Vec<u8>>>,
     settings_db: RwLock<HashMap<String, Vec<u8>>>,
     pub eth_mappings_db: RwLock<HashMap<EthHash, Vec<u8>>>,
+    pub indices_db: RwLock<HashMap<Cid, Vec<u8>>>,
 }
 
 impl MemoryDB {
@@ -135,15 +136,18 @@ impl EthMappingsStore for MemoryDB {
 
 impl IndicesStore for MemoryDB {
     fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
-        todo!()
+        Ok(self.indices_db.read().get(key).cloned())
     }
 
     fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
-        todo!()
+        self.indices_db
+            .write()
+            .insert(key.to_owned(), value.to_vec());
+        Ok(())
     }
 
     fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
-        todo!()
+        Ok(self.indices_db.read().contains_key(key))
     }
 }
 

src/libp2p/chain_exchange/provider.rs

@@ -176,10 +176,10 @@ mod tests {
 
         let response = make_chain_exchange_response(
             &ChainStore::new(
+                db.clone(),
                 db.clone(),
                 db.clone(),
                 db,
-                todo!(),
                 Arc::new(ChainConfig::default()),
                 gen_block,
             )

src/rpc/methods/chain.rs

@@ -1045,7 +1045,7 @@ mod tests {
                 db,
                 Arc::new(MemoryDB::default()),
                 Arc::new(MemoryDB::default()),
-                todo!(),
+                Arc::new(MemoryDB::default()),
                 Arc::new(ChainConfig::calibnet()),
                 genesis_block_header,
             )

src/rpc/methods/sync.rs

@@ -193,10 +193,10 @@ mod tests {
 
         let cs_arc = Arc::new(
             ChainStore::new(
+                db.clone(),
                 db.clone(),
                 db.clone(),
                 db,
-                todo!(),
                 chain_config.clone(),
                 genesis_header,
             )

src/tool/offline_server/server.rs

@@ -67,16 +67,16 @@ pub async fn start_offline_server(
         &db,
     )
     .await?;
+    let head_ts = Arc::new(db.heaviest_tipset()?);
     let chain_store = Arc::new(ChainStore::new(
         db.clone(),
         db.clone(),
         db.clone(),
-        todo!(),
+        db.clone(),
         chain_config.clone(),
         genesis_header.clone(),
     )?);
     let state_manager = Arc::new(StateManager::new(chain_store.clone(), chain_config)?);
-    let head_ts = Arc::new(db.heaviest_tipset()?);
 
     populate_eth_mappings(&state_manager, &head_ts)?;
 

src/tool/subcommands/api_cmd/api_compare_tests.rs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 use crate::blocks::{ElectionProof, Ticket, Tipset};
 use crate::chain::ChainStore;
-use crate::chain_sync::SyncConfig;
 use crate::db::car::ManyCar;
 use crate::eth::{EthChainId as EthChainIdType, SAFE_EPOCH_DELAY};
 use crate::lotus_json::HasLotusJson;
@@ -53,7 +52,7 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use similar::{ChangeTag, TextDiff};
-use std::{borrow::Cow, path::Path, path::PathBuf, str::FromStr, sync::Arc, time::Duration};
+use std::{borrow::Cow, path::PathBuf, str::FromStr, sync::Arc, time::Duration};
 use tabled::{builder::Builder, settings::Style};
 use tokio::sync::Semaphore;
 use tracing::debug;
@@ -1933,7 +1932,6 @@ pub(super) async fn create_tests(
     tests.extend(f3_tests()?);
     if !snapshot_files.is_empty() {
         let store = Arc::new(ManyCar::try_from(snapshot_files)?);
-        dbg!(&n_tipsets);
         revalidate_chain(store.clone(), n_tipsets).await?;
         tests.extend(snapshot_tests(
             store,
@@ -1949,9 +1947,8 @@ pub(super) async fn create_tests(
 async fn revalidate_chain(db: Arc<ManyCar>, n_ts_to_validate: usize) -> anyhow::Result<()> {
     let chain_config = Arc::new(handle_chain_config(&NetworkChain::Calibnet)?);
 
-    let genesis: Option<&Path> = None;
     let genesis_header = crate::genesis::read_genesis_header(
-        genesis.as_deref(),
+        None,
         chain_config.genesis_bytes(&db).await?.as_deref(),
         &db,
     )

src/tool/subcommands/api_cmd/generate_test_snapshot.rs

@@ -9,7 +9,7 @@ use crate::{
     daemon::db_util::load_all_forest_cars,
     db::{
         db_engine::open_db, parity_db::ParityDb, EthMappingsStore, HeaviestTipsetKeyProvider,
-        MemoryDB, SettingsStore, SettingsStoreExt, CAR_DB_DIR_NAME,
+        IndicesStore, MemoryDB, SettingsStore, SettingsStoreExt, CAR_DB_DIR_NAME,
     },
     genesis::read_genesis_header,
     libp2p::{NetworkMessage, PeerManager},
@@ -97,10 +97,10 @@ async fn ctx(
 
     let chain_store = Arc::new(
         ChainStore::new(
+            db.clone(),
             db.clone(),
             db.clone(),
             db,
-            todo!(),
             chain_config.clone(),
             genesis_header.clone(),
         )
@@ -294,3 +294,21 @@ impl<T: EthMappingsStore> EthMappingsStore for ReadOpsTrackingStore<T> {
         self.inner.delete(keys)
     }
 }
+
+impl<T: IndicesStore> IndicesStore for ReadOpsTrackingStore<T> {
+    fn read_bin(&self, key: &Cid) -> anyhow::Result<Option<Vec<u8>>> {
+        let result = self.inner.read_bin(key)?;
+        if let Some(v) = &result {
+            IndicesStore::write_bin(&self.tracker, key, v.as_slice())?;
+        }
+        self.inner.read_bin(key)
+    }
+
+    fn write_bin(&self, key: &Cid, value: &[u8]) -> anyhow::Result<()> {
+        self.inner.write_bin(key, value)
+    }
+
+    fn exists(&self, key: &Cid) -> anyhow::Result<bool> {
+        self.inner.exists(key)
+    }
+}