BitcoinCash/riftenlabs-indexer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FMT and clippy

Browse source
This commit is contained in:
Jakob Notland 2026-03-23 15:45:44 +01:00
parent cf57347240
commit 2273e042e1
3 changed files with 55 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/db/cauldron/ohlcv.rs
View file

@ -26,12 +26,10 @@ pub async fn create_table(pool: &SqlitePool) {
.expect("failed to create ohlcv_1h table");
// Needed for fast joins in rebuild_range; use IF NOT EXISTS so this is safe on existing DBs.
sqlx::query(
"CREATE INDEX IF NOT EXISTS idx_phe_txid ON pool_history_entry(txid)",
)
.execute(pool)
.await
.expect("failed to create idx_phe_txid index");
sqlx::query("CREATE INDEX IF NOT EXISTS idx_phe_txid ON pool_history_entry(txid)")
.execute(pool)
.await
.expect("failed to create idx_phe_txid index");
// Composite index for fast token+time range scans in the candlestick raw CTE.
sqlx::query(
@ -361,8 +359,10 @@ mod tests {
setup_db(&pool).await;
// Trade at 1727963400 — not hour-aligned; floor to 1727960400
insert_confirmed_trade(&pool, [0x01; 32], [0x02; 32], [0x03; 32], 1727963400, -1000, 25)
.await;
insert_confirmed_trade(
&pool, [0x01; 32], [0x02; 32], [0x03; 32], 1727963400, -1000, 25,
)
.await;
let result = get_min_trade_bucket_ts(&pool).await.unwrap();
assert_eq!(
@ -391,8 +391,10 @@ mod tests {
let pool = test_pool().await;
setup_db(&pool).await;
insert_confirmed_trade(&pool, [0x01; 32], [0x02; 32], [0x03; 32], 1727963400, -1000, 25)
.await;
insert_confirmed_trade(
&pool, [0x01; 32], [0x02; 32], [0x03; 32], 1727963400, -1000, 25,
)
.await;
let n1 = rebuild_range(&pool, &pool, 1727960400, 1727964000)
.await
@ -402,7 +404,10 @@ mod tests {
let n2 = rebuild_range(&pool, &pool, 1727960400, 1727964000)
.await
.unwrap();
assert_eq!(n2, 0, "second rebuild must insert nothing (INSERT OR IGNORE)");
assert_eq!(
n2, 0,
"second rebuild must insert nothing (INSERT OR IGNORE)"
);
}
/// Unconfirmed trades (tx.blockhash IS NULL) must not appear in `ohlcv_1h`.

45
src/main.rs
View file

@ -374,16 +374,22 @@ async fn launch() -> _ {
config
};
let (dbpool, bcmrdownloader, wellknowndownloader, crc20fetcher, ibd_state, indexing_in_progress) =
match start_program(config).await {
Ok(db) => db,
Err(e) => {
let backtrace = Backtrace::capture();
error!("Backtrace (if RUST_BACKTRACE=1):\n{backtrace}");
error!("Error: {e}");
panic!("Failed at program startup")
}
};
let (
dbpool,
bcmrdownloader,
wellknowndownloader,
crc20fetcher,
ibd_state,
indexing_in_progress,
) = match start_program(config).await {
Ok(db) => db,
Err(e) => {
let backtrace = Backtrace::capture();
error!("Backtrace (if RUST_BACKTRACE=1):\n{backtrace}");
error!("Error: {e}");
panic!("Failed at program startup")
}
};
let allowed_origins = AllowedOrigins::all();
let cors = rocket_cors::CorsOptions {
@ -432,7 +438,7 @@ async fn launch() -> _ {
indexing_in_progress.store(true, Ordering::Relaxed);
info!("ohlcv: starting post-IBD full backfill");
let now = crate::timeutil::time_now() as i64;
let now = crate::timeutil::time_now();
let cutoff = (now - BACKFILL_SAFETY_SECS) / 3600 * 3600;
let since_opt = match db::cauldron::ohlcv::get_max_bucket_ts(&dbpool.cauldron_r).await {
Ok(Some(ts)) => Some(ts + 3600),
@ -445,7 +451,10 @@ async fn launch() -> _ {
}
}
}
Err(e) => { warn!("ohlcv backfill: could not read max bucket ts: {e}"); None }
Err(e) => {
warn!("ohlcv backfill: could not read max bucket ts: {e}");
None
}
};
if since_opt.is_none() {
info!("ohlcv backfill: no confirmed trades found, skipping");
@ -496,8 +505,7 @@ async fn launch() -> _ {
const SAFETY_SECS: i64 = 3 * 3600;
loop {
let now = crate::timeutil::time_now() as i64;
let now = crate::timeutil::time_now();
// Floor to 1-hour boundary, 3 hours ago.
let cutoff = (now - SAFETY_SECS) / 3600 * 3600;
@ -530,8 +538,13 @@ async fn launch() -> _ {
let mut batch_start = since;
while batch_start < cutoff {
let batch_end = (batch_start + BATCH_SECS).min(cutoff);
match db::cauldron::ohlcv::rebuild_range(&ohlcv_read, &ohlcv_write, batch_start, batch_end)
.await
match db::cauldron::ohlcv::rebuild_range(
&ohlcv_read,
&ohlcv_write,
batch_start,
batch_end,
)
.await
{
Ok(n) => {
info!("ohlcv: materialised {n} buckets [{batch_start}, {batch_end})");

19
src/rpc/candlesticks.rs
View file

@ -311,9 +311,7 @@ pub async fn candlesticks(
// ohlcv covers at least part of the range, AND the start is hour-aligned.
// ohlcv_1h buckets are always aligned to multiples of 3600, so a non-aligned
// start would produce candles whose boundaries disagree with the raw path.
if step_size == 3600
&& ohlcv_materialized_end > timestamp_start
&& timestamp_start % 3600 == 0
if step_size == 3600 && ohlcv_materialized_end > timestamp_start && timestamp_start % 3600 == 0
{
let ohlcv_end = ohlcv_materialized_end.min(timestamp_end);
@ -326,8 +324,7 @@ pub async fn candlesticks(
if ohlcv_end < timestamp_end {
// Tail: query raw for [ohlcv_end, timestamp_end) and append.
let raw_trades =
fetch_raw_trades(pool, &token_blob, ohlcv_end, timestamp_end).await?;
let raw_trades = fetch_raw_trades(pool, &token_blob, ohlcv_end, timestamp_end).await?;
let mut tail_intervals = Vec::new();
let mut t = ohlcv_end;
@ -336,8 +333,13 @@ pub async fn candlesticks(
t += step_size;
}
let (tail, _, _) =
aggregate_raw_trades(&raw_trades, tail_intervals, step_size, found_first, last_close);
let (tail, _, _) = aggregate_raw_trades(
&raw_trades,
tail_intervals,
step_size,
found_first,
last_close,
);
result.extend(tail);
}
@ -352,8 +354,7 @@ pub async fn candlesticks(
current_start += step_size;
}
let all_trades =
fetch_raw_trades(pool, &token_blob, timestamp_start, timestamp_end).await?;
let all_trades = fetch_raw_trades(pool, &token_blob, timestamp_start, timestamp_end).await?;
let (result, _, _) = aggregate_raw_trades(&all_trades, intervals, step_size, false, None);
Ok(result)