store: Asyncify deployment::block_ptr

Author: lutter

store/postgres/src/deployment.rs

@@ -451,7 +451,7 @@ pub async fn transact_block(
     // Performance note: This costs us an extra DB query on every update. We used to put this in the
     // `where` clause of the `update` statement, but that caused Postgres to use bitmap scans instead
     // of a simple primary key lookup. So a separate query it is.
-    let block_ptr = block_ptr(conn, &site)?;
+    let block_ptr = block_ptr(conn, &site).await?;
     if let Some(block_ptr_from) = block_ptr {
         if block_ptr_from.number >= ptr.number {
             return Err(StoreError::DuplicateBlockProcessing(
@@ -528,7 +528,7 @@ pub async fn forward_block_ptr(
 
         // No matching rows were found. This is an error. By the filter conditions, this can only be
         // due to a missing deployment (which `block_ptr` catches) or duplicate block processing.
-        0 => match block_ptr(conn, &site)? {
+        0 => match block_ptr(conn, &site).await? {
             Some(block_ptr_from) if block_ptr_from.number >= ptr.number => Err(
                 StoreError::DuplicateBlockProcessing(site.deployment.clone(), ptr.number),
             ),
@@ -603,7 +603,10 @@ pub async fn revert_block_ptr(
     }
 }
 
-pub fn block_ptr(conn: &mut PgConnection, site: &Site) -> Result<Option<BlockPtr>, StoreError> {
+pub async fn block_ptr(
+    conn: &mut PgConnection,
+    site: &Site,
+) -> Result<Option<BlockPtr>, StoreError> {
     use head as h;
 
     let (number, hash) = h::table

store/postgres/src/deployment_store.rs

@@ -536,11 +536,11 @@ impl DeploymentStore {
         self.subgraph_info_with_conn(&mut conn, site).await
     }
 
-    fn block_ptr_with_conn(
+    async fn block_ptr_with_conn(
         conn: &mut PgConnection,
         site: Arc<Site>,
     ) -> Result<Option<BlockPtr>, StoreError> {
-        deployment::block_ptr(conn, &site)
+        deployment::block_ptr(conn, &site).await
     }
 
     pub(crate) async fn deployment_details(
@@ -931,7 +931,9 @@ impl DeploymentStore {
         self.with_conn(async move |conn, cancel| {
             cancel.check_cancel()?;
 
-            Self::block_ptr_with_conn(conn, site).map_err(Into::into)
+            Self::block_ptr_with_conn(conn, site)
+                .await
+                .map_err(Into::into)
         })
         .await
     }
@@ -982,10 +984,11 @@ impl DeploymentStore {
                 let layout = store.layout(conn, site.cheap_clone()).await?;
 
                 let mut block_ptr = block.cheap_clone();
-                let latest_block_ptr = match Self::block_ptr_with_conn(conn, site.cheap_clone())? {
-                    Some(inner) => inner,
-                    None => return Ok(None),
-                };
+                let latest_block_ptr =
+                    match Self::block_ptr_with_conn(conn, site.cheap_clone()).await? {
+                        Some(inner) => inner,
+                        None => return Ok(None),
+                    };
 
                 cancel.check_cancel()?;
 
@@ -1379,7 +1382,7 @@ impl DeploymentStore {
     ) -> Result<(), StoreError> {
         let mut conn = self.get_conn()?;
 
-        let block_ptr_from = Self::block_ptr_with_conn(&mut conn, site.cheap_clone())?;
+        let block_ptr_from = Self::block_ptr_with_conn(&mut conn, site.cheap_clone()).await?;
 
         // Sanity check on block numbers
         let from_number = block_ptr_from.map(|ptr| ptr.number);
@@ -1410,7 +1413,7 @@ impl DeploymentStore {
     ) -> Result<(), StoreError> {
         let mut conn = self.get_conn()?;
 
-        let block_ptr_from = Self::block_ptr_with_conn(&mut conn, site.cheap_clone())?;
+        let block_ptr_from = Self::block_ptr_with_conn(&mut conn, site.cheap_clone()).await?;
 
         // Sanity check on block numbers
         let from_number = block_ptr_from.map(|ptr| ptr.number);
@@ -1442,7 +1445,9 @@ impl DeploymentStore {
     ) -> Result<(), StoreError> {
         let mut conn = self.get_conn()?;
         // Unwrap: If we are reverting then the block ptr is not `None`.
-        let deployment_head = Self::block_ptr_with_conn(&mut conn, site.cheap_clone())?.unwrap();
+        let deployment_head = Self::block_ptr_with_conn(&mut conn, site.cheap_clone())
+            .await?
+            .unwrap();
 
         // Confidence check on revert to ensure we go backward only
         if block_ptr_to.number >= deployment_head.number {