Make connection creator non-async

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/factor-sqlite/src/host.rs

@@ -66,15 +66,12 @@ impl v2::HostConnection for InstanceState {
         if !self.allowed_databases.contains(&database) {
             return Err(v2::Error::AccessDenied);
         }
-        (self.get_connection_creator)(&database)
+        let conn = (self.get_connection_creator)(&database)
             .ok_or(v2::Error::NoSuchDatabase)?
-            .create_connection()
-            .await
-            .and_then(|conn| {
-                self.connections
-                    .push(conn)
-                    .map_err(|()| v2::Error::Io("too many connections opened".to_string()))
-            })
+            .create_connection()?;
+        self.connections
+            .push(conn)
+            .map_err(|()| v2::Error::Io("too many connections opened".to_string()))
             .map(Resource::new_own)
     }
 

crates/factor-sqlite/src/lib.rs

@@ -173,28 +173,24 @@ impl AppState {
         &self,
         label: &str,
     ) -> Option<Result<Box<dyn Connection>, v2::Error>> {
-        let connection = (self.get_connection_creator)(label)?
-            .create_connection()
-            .await;
+        let connection = (self.get_connection_creator)(label)?.create_connection();
         Some(connection)
     }
 }
 
 /// A creator of a connections for a particular SQLite database.
-#[async_trait]
 pub trait ConnectionCreator: Send + Sync {
     /// Get a *new* [`Connection`]
     ///
     /// The connection should be a new connection, not a reused one.
-    async fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error>;
+    fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error>;
 }
 
-#[async_trait::async_trait]
 impl<F> ConnectionCreator for F
 where
     F: Fn() -> anyhow::Result<Box<dyn Connection + 'static>> + Send + Sync + 'static,
 {
-    async fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+    fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
         (self)().map_err(|_| v2::Error::InvalidConnection)
     }
 }

crates/factor-sqlite/tests/factor_test.rs

@@ -143,9 +143,8 @@ impl spin_factor_sqlite::DefaultLabelResolver for DefaultLabelResolver {
 /// A connection creator that always returns an error.
 struct InvalidConnectionCreator;
 
-#[async_trait::async_trait]
 impl spin_factor_sqlite::ConnectionCreator for InvalidConnectionCreator {
-    async fn create_connection(
+    fn create_connection(
         &self,
     ) -> Result<Box<dyn spin_factor_sqlite::Connection + 'static>, spin_world::v2::sqlite::Error>
     {

crates/trigger/src/cli/sqlite_statements.rs

@@ -177,9 +177,8 @@ mod tests {
         }
     }
 
-    #[async_trait]
     impl ConnectionCreator for MockCreator {
-        async fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+        fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
             Ok(Box::new(MockConnection {
                 tx: self.tx.clone(),
             }))