libsql: move push_one_frame to sync.rs

Author: LucioFranco

libsql/src/local/database.rs

@@ -406,12 +406,15 @@ impl Database {
 
         let mut frame_no = start_frame_no;
         while frame_no <= end_frame_no {
+            let frame = conn.wal_get_frame(frame_no, page_size)?;
+
             // The server returns its maximum frame number. To avoid resending
             // frames the server already knows about, we need to update the
             // frame number to the one returned by the server.
-            let max_frame_no = self
-                .push_one_frame(&conn, &sync_ctx, generation, frame_no, page_size)
+            let max_frame_no = sync_ctx
+                .push_one_frame(frame.to_vec(), generation, frame_no)
                 .await?;
+
             if max_frame_no > frame_no {
                 frame_no = max_frame_no;
             }
@@ -425,35 +428,6 @@ impl Database {
         })
     }
 
-    #[cfg(feature = "sync")]
-    async fn push_one_frame(
-        &self,
-        conn: &Connection,
-        sync_ctx: &SyncContext,
-        generation: u32,
-        frame_no: u32,
-        page_size: u32,
-    ) -> Result<u32> {
-        let frame = conn.wal_get_frame(frame_no, page_size)?;
-
-        let uri = format!(
-            "{}/sync/{}/{}/{}",
-            sync_ctx.sync_url,
-            generation,
-            frame_no,
-            frame_no + 1
-        );
-        let max_frame_no = sync_ctx
-            .push_with_retry(
-                uri,
-                &sync_ctx.auth_token,
-                frame.to_vec(),
-                sync_ctx.max_retries,
-            )
-            .await?;
-        Ok(max_frame_no)
-    }
-
     pub(crate) fn path(&self) -> &str {
         &self.db_path
     }

libsql/src/sync.rs

@@ -18,7 +18,27 @@ impl SyncContext {
         }
     }
 
-    pub(crate) async fn push_with_retry(
+    pub(crate) async fn push_one_frame(
+        &self,
+        frame: Vec<u8>,
+        generation: u32,
+        frame_no: u32,
+    ) -> Result<u32> {
+        let uri = format!(
+            "{}/sync/{}/{}/{}",
+            self.sync_url,
+            generation,
+            frame_no,
+            frame_no + 1
+        );
+        let max_frame_no = self
+            .push_with_retry(uri, &self.auth_token, frame.to_vec(), self.max_retries)
+            .await?;
+
+        Ok(max_frame_no)
+    }
+
+    async fn push_with_retry(
         &self,
         uri: String,
         auth_token: &Option<String>,