fix after merge

This commit is contained in:
Rostyslav Tyshko 2025-06-10 01:39:11 -04:00
parent b77289937f
commit 720263ae2d
4 changed files with 9 additions and 6 deletions

View File

@ -88,6 +88,8 @@ impl NodeBlockStore {
Ok(serde_json::from_slice( Ok(serde_json::from_slice(
&self.dbio.get_snapshot_transaction()?, &self.dbio.get_snapshot_transaction()?,
)?) )?)
}
pub fn put_snapshot_at_block_id( pub fn put_snapshot_at_block_id(
&self, &self,
id: u64, id: u64,

View File

@ -30,7 +30,7 @@ pub struct NodeChainStore {
} }
impl NodeChainStore { impl NodeChainStore {
pub fn new(home_dir: &Path, genesis_block: Block) -> Result<(Self, u64)> { pub fn new(config: NodeConfig, genesis_block: Block) -> Result<(Self, u64)> {
let mut acc_map = HashMap::new(); let mut acc_map = HashMap::new();
let mut nullifier_store = HashSet::new(); let mut nullifier_store = HashSet::new();
let mut utxo_commitments_store = UTXOCommitmentsMerkleTree::new(vec![]); let mut utxo_commitments_store = UTXOCommitmentsMerkleTree::new(vec![]);
@ -58,6 +58,7 @@ impl NodeChainStore {
nullifier_store, nullifier_store,
utxo_commitments_store, utxo_commitments_store,
pub_tx_store, pub_tx_store,
node_config: config,
}, },
block_id, block_id,
)) ))

View File

@ -98,7 +98,7 @@ impl NodeCore {
let genesis_block = client.get_block(genesis_id.genesis_id).await?.block; let genesis_block = client.get_block(genesis_id.genesis_id).await?.block;
let (mut storage, mut chain_height) = NodeChainStore::new(&config.home, genesis_block)?; let (mut storage, mut chain_height) = NodeChainStore::new(config.clone(), genesis_block)?;
pre_start::setup_empty_sc_states(&storage).await?; pre_start::setup_empty_sc_states(&storage).await?;

View File

@ -122,19 +122,19 @@ impl RocksDBIO {
.map_err(|rerr| DbError::rocksdb_cast_message(rerr, None)) .map_err(|rerr| DbError::rocksdb_cast_message(rerr, None))
} }
pub fn meta_column(&self) -> Arc<BoundColumnFamily> { pub fn meta_column(&self) -> Arc<BoundColumnFamily<'_>> {
self.db.cf_handle(CF_META_NAME).unwrap() self.db.cf_handle(CF_META_NAME).unwrap()
} }
pub fn block_column(&self) -> Arc<BoundColumnFamily> { pub fn block_column(&self) -> Arc<BoundColumnFamily<'_>> {
self.db.cf_handle(CF_BLOCK_NAME).unwrap() self.db.cf_handle(CF_BLOCK_NAME).unwrap()
} }
pub fn sc_column(&self) -> Arc<BoundColumnFamily> { pub fn sc_column(&self) -> Arc<BoundColumnFamily<'_>> {
self.db.cf_handle(CF_SC_NAME).unwrap() self.db.cf_handle(CF_SC_NAME).unwrap()
} }
pub fn snapshot_column(&self) -> Arc<BoundColumnFamily> { pub fn snapshot_column(&self) -> Arc<BoundColumnFamily<'_>> {
self.db.cf_handle(CF_SNAPSHOT_NAME).unwrap() self.db.cf_handle(CF_SNAPSHOT_NAME).unwrap()
} }