global: fixes of Parser::new

This commit is contained in:
nym21
2025-09-01 20:34:27 +02:00
parent fe5343c1d6
commit 1c2afd14dd
9 changed files with 38 additions and 27 deletions

6
Cargo.lock generated
View File

@@ -3885,6 +3885,8 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
[[package]] [[package]]
name = "seqdb" name = "seqdb"
version = "0.2.5" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c54ab988c96efa9d275ca2b12bf2d3c6adec993b8e82ea31a88c984abdaa14fa"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
@@ -4711,6 +4713,8 @@ checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
[[package]] [[package]]
name = "vecdb" name = "vecdb"
version = "0.2.5" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e5c4ec34c376be3a41435eeb7672d0ea0e9c1d60c5d1d90218912588f91abea"
dependencies = [ dependencies = [
"ctrlc", "ctrlc",
"log", "log",
@@ -4729,6 +4733,8 @@ dependencies = [
[[package]] [[package]]
name = "vecdb_derive" name = "vecdb_derive"
version = "0.2.5" version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "778c4874c05822465e28cae6a7dead593a73124ec80afb85b85adae5ac883368"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.106", "syn 2.0.106",

View File

@@ -52,8 +52,8 @@ serde_bytes = "0.11.17"
serde_derive = "1.0.219" serde_derive = "1.0.219"
serde_json = { version = "1.0.143", features = ["float_roundtrip"] } serde_json = { version = "1.0.143", features = ["float_roundtrip"] }
tokio = { version = "1.47.1", features = ["rt-multi-thread"] } tokio = { version = "1.47.1", features = ["rt-multi-thread"] }
vecdb = { path = "../seqdb/crates/vecdb", features = ["derive"]} # vecdb = { path = "../seqdb/crates/vecdb", features = ["derive"]}
# vecdb = { version = "0.2.5", features = ["derive"]} vecdb = { version = "0.2.5", features = ["derive"]}
zerocopy = "0.8.26" zerocopy = "0.8.26"
zerocopy-derive = "0.8.26" zerocopy-derive = "0.8.26"

View File

@@ -64,7 +64,7 @@ brk = { version = "0.0.88", features = ["parser", "indexer", "computer"] }
use brk::{parser, indexer, computer}; use brk::{parser, indexer, computer};
// Core data pipeline only // Core data pipeline only
let parser = parser::Parser::new(blocks_dir, output_dir, rpc); let parser = parser::Parser::new(blocks_dir, Some(output_dir), rpc);
let mut indexer = indexer::Indexer::forced_import(output_dir)?; let mut indexer = indexer::Indexer::forced_import(output_dir)?;
let mut computer = computer::Computer::forced_import(output_dir, &indexer, None)?; let mut computer = computer::Computer::forced_import(output_dir, &indexer, None)?;
``` ```
@@ -81,7 +81,7 @@ use brk::{structs, parser};
// Just parsing and types // Just parsing and types
let height = structs::Height::new(800_000); let height = structs::Height::new(800_000);
let parser = parser::Parser::new(blocks_dir, output_dir, rpc); let parser = parser::Parser::new(blocks_dir, Some(output_dir), rpc);
``` ```
## Feature Flags ## Feature Flags
@@ -113,7 +113,7 @@ use brk::*;
// Full data pipeline setup // Full data pipeline setup
let config = cli::Config::load()?; let config = cli::Config::load()?;
let rpc = /* Bitcoin Core RPC client */; let rpc = /* Bitcoin Core RPC client */;
let parser = parser::Parser::new(config.blocks_dir, config.output_dir, rpc); let parser = parser::Parser::new(config.blocks_dir, Some(config.output_dir), rpc);
let mut indexer = indexer::Indexer::forced_import(&config.output_dir)?; let mut indexer = indexer::Indexer::forced_import(&config.output_dir)?;
let mut computer = computer::Computer::forced_import(&config.output_dir, &indexer, None)?; let mut computer = computer::Computer::forced_import(&config.output_dir, &indexer, None)?;
let interface = interface::Interface::build(&indexer, &computer); let interface = interface::Interface::build(&indexer, &computer);
@@ -152,7 +152,7 @@ use brk::{structs, parser, error};
// Custom application with BRK components // Custom application with BRK components
fn analyze_blocks() -> error::Result<()> { fn analyze_blocks() -> error::Result<()> {
let parser = parser::Parser::new(blocks_dir, output_dir, rpc); let parser = parser::Parser::new(blocks_dir, Some(output_dir), rpc);
parser.parse(None, None) parser.parse(None, None)
.iter() .iter()

View File

@@ -13,6 +13,7 @@ use brk_bundler::bundle;
use brk_computer::Computer; use brk_computer::Computer;
use brk_indexer::Indexer; use brk_indexer::Indexer;
use brk_interface::Interface; use brk_interface::Interface;
use brk_parser::Parser;
use brk_server::{Server, VERSION}; use brk_server::{Server, VERSION};
use log::info; use log::info;
use vecdb::Exit; use vecdb::Exit;
@@ -46,7 +47,7 @@ pub fn run() -> color_eyre::Result<()> {
let exit = Exit::new(); let exit = Exit::new();
exit.set_ctrlc_handler(); exit.set_ctrlc_handler();
let parser = brk_parser::Parser::new(config.blocksdir(), config.brkdir(), rpc); let parser = Parser::new(config.blocksdir(), Some(config.brkdir()), rpc);
let mut indexer = Indexer::forced_import(&config.brkdir())?; let mut indexer = Indexer::forced_import(&config.brkdir())?;

View File

@@ -34,7 +34,11 @@ pub fn main() -> Result<()> {
let outputs_dir = Path::new(&std::env::var("HOME").unwrap()).join(".brk"); let outputs_dir = Path::new(&std::env::var("HOME").unwrap()).join(".brk");
// let outputs_dir = Path::new("../../_outputs"); // let outputs_dir = Path::new("../../_outputs");
let parser = Parser::new(bitcoin_dir.join("blocks"), outputs_dir.to_path_buf(), rpc); let parser = Parser::new(
bitcoin_dir.join("blocks"),
Some(outputs_dir.to_path_buf()),
rpc,
);
let mut indexer = Indexer::forced_import(&outputs_dir)?; let mut indexer = Indexer::forced_import(&outputs_dir)?;

View File

@@ -60,7 +60,7 @@ let rpc = Box::leak(Box::new(Client::new(
// Create parser for Bitcoin Core block files // Create parser for Bitcoin Core block files
let parser = Parser::new( let parser = Parser::new(
Path::new("~/.bitcoin/blocks").to_path_buf(), Path::new("~/.bitcoin/blocks").to_path_buf(),
Path::new("./brk_data").to_path_buf(), Some(Path::new("./brk_data").to_path_buf()),
rpc rpc
); );

View File

@@ -33,7 +33,7 @@ fn main() -> Result<()> {
let exit = Exit::new(); let exit = Exit::new();
exit.set_ctrlc_handler(); exit.set_ctrlc_handler();
let parser = Parser::new(blocks_dir, outputs_dir.to_path_buf(), rpc); let parser = Parser::new(blocks_dir, Some(outputs_dir.to_path_buf()), rpc);
fs::create_dir_all(outputs_dir)?; fs::create_dir_all(outputs_dir)?;

View File

@@ -47,7 +47,7 @@ let rpc = Box::leak(Box::new(Client::new(
// Create parser // Create parser
let parser = Parser::new( let parser = Parser::new(
Path::new("~/.bitcoin/blocks").to_path_buf(), Path::new("~/.bitcoin/blocks").to_path_buf(),
Path::new("./output").to_path_buf(), Some(Path::new("./output").to_path_buf()),
rpc, rpc,
); );

View File

@@ -26,7 +26,7 @@ pub fn main() -> Result<()> {
let exit = Exit::new(); let exit = Exit::new();
exit.set_ctrlc_handler(); exit.set_ctrlc_handler();
let parser = Parser::new(bitcoin_dir.join("blocks"), brk_dir.to_path_buf(), rpc); let parser = Parser::new(bitcoin_dir.join("blocks"), Some(brk_dir.to_path_buf()), rpc);
let outputs_dir = Path::new("../../_outputs"); let outputs_dir = Path::new("../../_outputs");