store: Remove PermittedConnection.into_inner

Author: lutter

store/postgres/src/pool/mod.rs

@@ -51,14 +51,6 @@ pub struct PermittedConnection {
     _permit: tokio::sync::OwnedSemaphorePermit,
 }
 
-impl PermittedConnection {
-    /// Returns the underlying connection, consuming the permit.
-    /// The permit is released when this method is called.
-    pub fn into_inner(self) -> AsyncPgConnection {
-        self.conn
-    }
-}
-
 impl Deref for PermittedConnection {
     type Target = AsyncPgConnection;
     fn deref(&self) -> &Self::Target {

store/postgres/src/primary.rs

@@ -4,7 +4,7 @@
 use crate::{
     block_range::UNVERSIONED_RANGE,
     detail::DeploymentDetail,
-    pool::PRIMARY_PUBLIC,
+    pool::{PermittedConnection, PRIMARY_PUBLIC},
     subgraph_store::{unused, Shard, PRIMARY_SHARD},
     AsyncPgConnection, ConnectionPool, ForeignServer, NotificationSender,
 };
@@ -779,11 +779,11 @@ mod queries {
 /// A wrapper for a database connection that provides access to functionality
 /// that works only on the primary database
 pub struct Connection {
-    conn: AsyncPgConnection,
+    conn: PermittedConnection,
 }
 
 impl Connection {
-    pub fn new(conn: AsyncPgConnection) -> Self {
+    pub fn new(conn: PermittedConnection) -> Self {
         Self { conn }
     }
 
@@ -807,13 +807,13 @@ impl Connection {
         type TM = <AsyncPgConnection as diesel_async::AsyncConnection>::TransactionManager;
 
         async move {
-            TM::begin_transaction(&mut self.conn).await?;
+            TM::begin_transaction(&mut *self.conn).await?;
             match callback(self).await {
                 Ok(value) => {
-                    TM::commit_transaction(&mut self.conn).await?;
+                    TM::commit_transaction(&mut *self.conn).await?;
                     Ok(value)
                 }
-                Err(user_error) => match TM::rollback_transaction(&mut self.conn).await {
+                Err(user_error) => match TM::rollback_transaction(&mut *self.conn).await {
                     Ok(()) => Err(user_error),
                     Err(diesel::result::Error::BrokenTransactionManager) => {
                         // In this case we are probably more interested by the

store/postgres/src/subgraph_store.rs

@@ -819,7 +819,7 @@ impl Inner {
     /// of connections in between getting the first one and trying to get the
     /// second one.
     pub(crate) async fn primary_conn(&self) -> Result<primary::Connection, StoreError> {
-        let conn = self.mirror.primary().get().await?;
+        let conn = self.mirror.primary().get_permitted().await?;
         Ok(primary::Connection::new(conn))
     }
 
@@ -1381,15 +1381,15 @@ impl EnsLookup {
     }
 
     async fn is_table_empty(pool: &ConnectionPool) -> Result<bool, StoreError> {
-        let conn = pool.get_permitted().await?.into_inner();
+        let conn = pool.get_permitted().await?;
         primary::Connection::new(conn).is_ens_table_empty().await
     }
 }
 
 #[async_trait]
 impl EnsLookupTrait for EnsLookup {
     async fn find_name(&self, hash: &str) -> Result<Option<String>, StoreError> {
-        let conn = self.primary.get_permitted().await?.into_inner();
+        let conn = self.primary.get_permitted().await?;
         primary::Connection::new(conn).find_ens_name(hash).await
     }