0.7.27 +Refactor
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
// file: kb_lib/src/db/queries/token_burn_event.rs
|
||||
|
||||
//! Queries for `kb_token_burn_events`.
|
||||
//! Queries for `k_sol_token_burn_events`.
|
||||
|
||||
/// Inserts or updates one normalized token burn event row.
|
||||
pub async fn upsert_token_burn_event(
|
||||
database: &crate::KbDatabase,
|
||||
dto: &crate::KbTokenBurnEventDto,
|
||||
) -> Result<i64, crate::KbError> {
|
||||
pub async fn query_token_burn_events_upsert(
|
||||
database: &crate::Database,
|
||||
dto: &crate::TokenBurnEventDto,
|
||||
) -> Result<i64, crate::Error> {
|
||||
let slot_i64 = match dto.slot {
|
||||
Some(slot) => {
|
||||
let slot_result = i64::try_from(slot);
|
||||
match slot_result {
|
||||
Ok(slot) => Some(slot),
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot convert token burn event slot '{}' to i64: {}",
|
||||
slot, error
|
||||
)));
|
||||
@@ -23,10 +23,10 @@ pub async fn upsert_token_burn_event(
|
||||
None => None,
|
||||
};
|
||||
match database.connection() {
|
||||
crate::KbDatabaseConnection::Sqlite(pool) => {
|
||||
crate::DatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query(
|
||||
r#"
|
||||
INSERT INTO kb_token_burn_events (
|
||||
INSERT INTO k_sol_token_burn_events (
|
||||
token_id,
|
||||
signature,
|
||||
instruction_index,
|
||||
@@ -60,15 +60,15 @@ ON CONFLICT(signature, instruction_index) DO UPDATE SET
|
||||
.execute(pool)
|
||||
.await;
|
||||
if let Err(error) = query_result {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot upsert kb_token_burn_events on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot upsert k_sol_token_burn_events on sqlite: {}",
|
||||
error
|
||||
)));
|
||||
}
|
||||
let id_result = sqlx::query_scalar::<sqlx::Sqlite, i64>(
|
||||
r#"
|
||||
SELECT id
|
||||
FROM kb_token_burn_events
|
||||
FROM k_sol_token_burn_events
|
||||
WHERE signature = ? AND instruction_index = ?
|
||||
LIMIT 1
|
||||
"#,
|
||||
@@ -80,8 +80,8 @@ LIMIT 1
|
||||
match id_result {
|
||||
Ok(id) => return Ok(id),
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot fetch kb_token_burn_events id for signature '{}' and instruction_index '{}' on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot fetch k_sol_token_burn_events id for signature '{}' and instruction_index '{}' on sqlite: {}",
|
||||
dto.signature, dto.instruction_index, error
|
||||
)));
|
||||
},
|
||||
@@ -91,16 +91,16 @@ LIMIT 1
|
||||
}
|
||||
|
||||
/// Lists recent token burn events ordered from newest to oldest.
|
||||
pub async fn list_recent_token_burn_events(
|
||||
database: &crate::KbDatabase,
|
||||
pub async fn query_token_burn_events_list_recent(
|
||||
database: &crate::Database,
|
||||
limit: u32,
|
||||
) -> Result<std::vec::Vec<crate::KbTokenBurnEventDto>, crate::KbError> {
|
||||
) -> Result<std::vec::Vec<crate::TokenBurnEventDto>, crate::Error> {
|
||||
if limit == 0 {
|
||||
return Ok(std::vec::Vec::new());
|
||||
}
|
||||
match database.connection() {
|
||||
crate::KbDatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbTokenBurnEventEntity>(
|
||||
crate::DatabaseConnection::Sqlite(pool) => {
|
||||
let query_result = sqlx::query_as::<sqlx::Sqlite, crate::TokenBurnEventEntity>(
|
||||
r#"
|
||||
SELECT
|
||||
id,
|
||||
@@ -113,7 +113,7 @@ SELECT
|
||||
amount,
|
||||
supply_after,
|
||||
executed_at
|
||||
FROM kb_token_burn_events
|
||||
FROM k_sol_token_burn_events
|
||||
ORDER BY id DESC
|
||||
LIMIT ?
|
||||
"#,
|
||||
@@ -124,15 +124,15 @@ LIMIT ?
|
||||
let entities = match query_result {
|
||||
Ok(entities) => entities,
|
||||
Err(error) => {
|
||||
return Err(crate::KbError::Db(format!(
|
||||
"cannot list kb_token_burn_events on sqlite: {}",
|
||||
return Err(crate::Error::Db(format!(
|
||||
"cannot list k_sol_token_burn_events on sqlite: {}",
|
||||
error
|
||||
)));
|
||||
},
|
||||
};
|
||||
let mut dtos = std::vec::Vec::new();
|
||||
for entity in entities {
|
||||
let dto_result = crate::KbTokenBurnEventDto::try_from(entity);
|
||||
let dto_result = crate::TokenBurnEventDto::try_from(entity);
|
||||
let dto = match dto_result {
|
||||
Ok(dto) => dto,
|
||||
Err(error) => return Err(error),
|
||||
@@ -150,10 +150,10 @@ mod tests {
|
||||
async fn normalized_activity_roundtrip_works() {
|
||||
let tempdir = tempfile::tempdir().expect("tempdir must succeed");
|
||||
let database_path = tempdir.path().join("normalized_activity.sqlite3");
|
||||
let config = crate::KbDatabaseConfig {
|
||||
let config = crate::DatabaseConfig {
|
||||
enabled: true,
|
||||
backend: crate::KbDatabaseBackend::Sqlite,
|
||||
sqlite: crate::KbSqliteDatabaseConfig {
|
||||
backend: crate::DatabaseBackend::Sqlite,
|
||||
sqlite: crate::SqliteDatabaseConfig {
|
||||
path: database_path.to_string_lossy().to_string(),
|
||||
create_if_missing: true,
|
||||
busy_timeout_ms: 5000,
|
||||
@@ -162,18 +162,18 @@ mod tests {
|
||||
use_wal: true,
|
||||
},
|
||||
};
|
||||
let database = crate::KbDatabase::connect_and_initialize(&config)
|
||||
let database = crate::Database::connect_and_initialize(&config)
|
||||
.await
|
||||
.expect("database init must succeed");
|
||||
let dex_id = crate::upsert_dex(
|
||||
let dex_id = crate::query_dexs_upsert(
|
||||
&database,
|
||||
&crate::KbDexDto::new("raydium".to_string(), "Raydium".to_string(), None, None, true),
|
||||
&crate::DexDto::new("raydium".to_string(), "Raydium".to_string(), None, None, true),
|
||||
)
|
||||
.await
|
||||
.expect("dex upsert must succeed");
|
||||
let base_token_id = crate::upsert_token(
|
||||
let base_token_id = crate::query_tokens_upsert(
|
||||
&database,
|
||||
&crate::KbTokenDto::new(
|
||||
&crate::TokenDto::new(
|
||||
"Base111111111111111111111111111111111111111".to_string(),
|
||||
Some("BASE".to_string()),
|
||||
Some("Base Token".to_string()),
|
||||
@@ -184,10 +184,10 @@ mod tests {
|
||||
)
|
||||
.await
|
||||
.expect("base token upsert must succeed");
|
||||
let quote_token_id = crate::upsert_token(
|
||||
let quote_token_id = crate::query_tokens_upsert(
|
||||
&database,
|
||||
&crate::KbTokenDto::new(
|
||||
"So11111111111111111111111111111111111111112".to_string(),
|
||||
&crate::TokenDto::new(
|
||||
crate::WSOL_MINT_ID.to_string(),
|
||||
Some("WSOL".to_string()),
|
||||
Some("Wrapped SOL".to_string()),
|
||||
Some(9),
|
||||
@@ -197,20 +197,20 @@ mod tests {
|
||||
)
|
||||
.await
|
||||
.expect("quote token upsert must succeed");
|
||||
let pool_id = crate::upsert_pool(
|
||||
let pool_id = crate::query_pools_upsert(
|
||||
&database,
|
||||
&crate::KbPoolDto::new(
|
||||
&crate::PoolDto::new(
|
||||
dex_id,
|
||||
"Pool111111111111111111111111111111111111111".to_string(),
|
||||
crate::KbPoolKind::Amm,
|
||||
crate::KbPoolStatus::Active,
|
||||
crate::PoolKind::Amm,
|
||||
crate::PoolStatus::Active,
|
||||
),
|
||||
)
|
||||
.await
|
||||
.expect("pool upsert must succeed");
|
||||
let pair_id = crate::upsert_pair(
|
||||
let pair_id = crate::query_pairs_upsert(
|
||||
&database,
|
||||
&crate::KbPairDto::new(
|
||||
&crate::PairDto::new(
|
||||
dex_id,
|
||||
pool_id,
|
||||
base_token_id,
|
||||
@@ -220,9 +220,9 @@ mod tests {
|
||||
)
|
||||
.await
|
||||
.expect("pair upsert must succeed");
|
||||
let swap_id = crate::upsert_swap(
|
||||
let swap_id = crate::query_swaps_upsert(
|
||||
&database,
|
||||
&crate::KbSwapDto::new(
|
||||
&crate::SwapDto::new(
|
||||
dex_id,
|
||||
pool_id,
|
||||
Some(pair_id),
|
||||
@@ -235,21 +235,21 @@ mod tests {
|
||||
"1000.50".to_string(),
|
||||
"2.75".to_string(),
|
||||
Some("0.002748625687156422".to_string()),
|
||||
crate::KbSwapTradeSide::BuyBase,
|
||||
crate::SwapTradeSide::BuyBase,
|
||||
),
|
||||
)
|
||||
.await
|
||||
.expect("swap upsert must succeed");
|
||||
let liquidity_id = crate::upsert_liquidity_event(
|
||||
let liquidity_id = crate::query_liquidity_events_upsert(
|
||||
&database,
|
||||
&crate::KbLiquidityEventDto::new(
|
||||
&crate::LiquidityEventDto::new(
|
||||
dex_id,
|
||||
pool_id,
|
||||
Some(pair_id),
|
||||
"liq-signature-1".to_string(),
|
||||
1,
|
||||
Some(1001),
|
||||
crate::KbLiquidityEventKind::Add,
|
||||
crate::LiquidityEventKind::Add,
|
||||
Some("LpUser1111111111111111111111111111111111".to_string()),
|
||||
base_token_id,
|
||||
quote_token_id,
|
||||
@@ -261,9 +261,9 @@ mod tests {
|
||||
)
|
||||
.await
|
||||
.expect("liquidity event upsert must succeed");
|
||||
let mint_id = crate::upsert_token_mint_event(
|
||||
let mint_id = crate::query_token_mint_events_upsert(
|
||||
&database,
|
||||
&crate::KbTokenMintEventDto::new(
|
||||
&crate::TokenMintEventDto::new(
|
||||
base_token_id,
|
||||
"mint-signature-1".to_string(),
|
||||
2,
|
||||
@@ -276,9 +276,9 @@ mod tests {
|
||||
)
|
||||
.await
|
||||
.expect("token mint event upsert must succeed");
|
||||
let burn_id = crate::upsert_token_burn_event(
|
||||
let burn_id = crate::query_token_burn_events_upsert(
|
||||
&database,
|
||||
&crate::KbTokenBurnEventDto::new(
|
||||
&crate::TokenBurnEventDto::new(
|
||||
base_token_id,
|
||||
"burn-signature-1".to_string(),
|
||||
3,
|
||||
@@ -295,14 +295,16 @@ mod tests {
|
||||
assert!(liquidity_id > 0);
|
||||
assert!(mint_id > 0);
|
||||
assert!(burn_id > 0);
|
||||
let swaps = crate::list_recent_swaps(&database, 10).await.expect("swaps list must succeed");
|
||||
let liquidity_events = crate::list_recent_liquidity_events(&database, 10)
|
||||
let swaps = crate::query_swaps_list_recent(&database, 10)
|
||||
.await
|
||||
.expect("swaps list must succeed");
|
||||
let liquidity_events = crate::query_liquidity_events_list_recent(&database, 10)
|
||||
.await
|
||||
.expect("liquidity list must succeed");
|
||||
let mint_events = crate::list_recent_token_mint_events(&database, 10)
|
||||
let mint_events = crate::query_token_mint_events_list_recent(&database, 10)
|
||||
.await
|
||||
.expect("mint events list must succeed");
|
||||
let burn_events = crate::list_recent_token_burn_events(&database, 10)
|
||||
let burn_events = crate::query_token_burn_events_list_recent(&database, 10)
|
||||
.await
|
||||
.expect("burn events list must succeed");
|
||||
assert_eq!(swaps.len(), 1);
|
||||
|
||||
Reference in New Issue
Block a user