refactor

Author: findolor

crates/cli/src/commands/local_db/sync/mod.rs

@@ -3,7 +3,6 @@ pub(crate) mod config;
 pub(crate) mod data_source;
 pub(crate) mod runner;
 pub(crate) mod storage;
-pub(crate) mod store;
 pub(crate) mod token;
 
 pub use cli::SyncLocalDb;

crates/cli/src/commands/local_db/sync/runner/apply.rs

@@ -111,6 +111,8 @@ mod tests {
     use crate::commands::local_db::sqlite::sqlite_execute;
     use crate::commands::local_db::sync::storage::DEFAULT_SCHEMA_SQL;
 
+    const RAW_SQL_STUB: &str = "INSERT INTO raw_events (block_number, block_timestamp, transaction_hash, log_index, address, topics, data, raw_json) VALUES (0, NULL, '0x0', 0, '0x0', '[]', '0x', '{}');\n";
+
     struct MockDataSource {
         sql_result: String,
         rpc_urls: Vec<Url>,
@@ -258,7 +260,7 @@ mod tests {
             captured_prefixes: Mutex::new(vec![]),
             captured_events: Mutex::new(vec![]),
             captured_decimals: Mutex::new(vec![]),
-            raw_sql: "RAW_PREFIX;\n".to_string(),
+            raw_sql: RAW_SQL_STUB.to_string(),
             captured_raw: Mutex::new(vec![]),
         };
 
@@ -279,7 +281,7 @@ mod tests {
         assert!(result.contains("INSERT INTO sync"));
         let prefixes = data_source.captured_prefixes.lock().unwrap();
         assert_eq!(prefixes.len(), 1);
-        assert!(prefixes[0].starts_with("RAW_PREFIX;"));
+        assert!(prefixes[0].starts_with("INSERT INTO raw_events"));
         let raw = data_source.captured_raw.lock().unwrap();
         assert_eq!(raw.len(), 1);
         assert!(raw[0].is_empty());
@@ -323,7 +325,7 @@ mod tests {
             captured_prefixes: Mutex::new(Vec::new()),
             captured_events: Mutex::new(Vec::new()),
             captured_decimals: Mutex::new(Vec::new()),
-            raw_sql: "RAW;\n".into(),
+            raw_sql: RAW_SQL_STUB.into(),
             captured_raw: Mutex::new(Vec::new()),
         };
 
@@ -357,7 +359,7 @@ mod tests {
 
         let prefixes = data_source.captured_prefixes.lock().unwrap();
         assert_eq!(prefixes.len(), 1);
-        assert!(prefixes[0].starts_with("RAW;\n"));
+        assert!(prefixes[0].starts_with("INSERT INTO raw_events"));
 
         let captured_events = data_source.captured_events.lock().unwrap();
         assert_eq!(captured_events.len(), 1);

crates/cli/src/commands/local_db/sync/runner/mod.rs

@@ -198,6 +198,8 @@ mod tests {
     use crate::commands::local_db::sqlite::sqlite_execute;
     use crate::commands::local_db::sync::storage::DEFAULT_SCHEMA_SQL;
 
+    const RAW_SQL_STUB: &str = "INSERT INTO raw_events (block_number, block_timestamp, transaction_hash, log_index, address, topics, data, raw_json) VALUES (0, NULL, '0x0', 0, '0x0', '[]', '0x', '{}');\n";
+
     struct TestFetcher {
         metadata: Vec<(Address, TokenInfo)>,
         calls: Mutex<Vec<Vec<Address>>>,
@@ -403,7 +405,7 @@ mod tests {
             sql_calls: Mutex::new(vec![]),
             prefixes: Mutex::new(vec![]),
             decimals: Mutex::new(vec![]),
-            raw_sql: "RAW_EVENTS;\n".into(),
+            raw_sql: RAW_SQL_STUB.into(),
             raw_calls: Mutex::new(vec![]),
         };
 
@@ -512,7 +514,7 @@ mod tests {
             sql_calls: Mutex::new(vec![]),
             prefixes: Mutex::new(vec![]),
             decimals: Mutex::new(vec![]),
-            raw_sql: "RAW;\n".into(),
+            raw_sql: RAW_SQL_STUB.into(),
             raw_calls: Mutex::new(vec![]),
         };
         let fetcher = TestFetcher {

crates/common/src/raindex_client/local_db/mod.rs

@@ -12,7 +12,10 @@ use alloy::primitives::ruint::ParseError;
 use alloy::primitives::{hex::FromHexError, Address};
 use decode::{decode_events as decode_events_impl, DecodedEvent, DecodedEventData};
 pub use fetch::FetchConfig;
-use insert::decoded_events_to_sql as decoded_events_to_sql_impl;
+use insert::{
+    decoded_events_to_sql as decoded_events_to_sql_impl,
+    raw_events_to_sql as raw_events_to_sql_impl,
+};
 use query::LocalDbQueryError;
 use std::collections::HashMap;
 use url::Url;
@@ -234,6 +237,15 @@ impl LocalDb {
             },
         )
     }
+
+    pub fn raw_events_to_sql(
+        &self,
+        raw_events: &[LogEntryResponse],
+    ) -> Result<String, LocalDbError> {
+        raw_events_to_sql_impl(raw_events).map_err(|err| LocalDbError::InsertError {
+            message: err.to_string(),
+        })
+    }
 }
 
 #[wasm_export]