added Send bound on the underlying stream, added test

jbg · jbg · commit c9f53c059e55 · 2019-07-12T23:58:37.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tokio-postgres-rustls"
 description = "Rustls integration for tokio-postgres"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["jbg <jbg@dtmf.io>"]
 edition = "2018"
 license = "MIT"
@@ -14,3 +14,6 @@ tokio-io = "0.1.12"
 tokio-postgres = "0.4.0-rc.3"
 tokio-rustls = "0.10.0-alpha.3"
 webpki = "0.19.1"
+
+[dev-dependencies]
+tokio = "0.1.21"
diff --git a/src/lib.rs b/src/lib.rs
@@ -23,7 +23,7 @@ impl MakeRustlsConnect {
 
 impl<S> MakeTlsConnect<S> for MakeRustlsConnect
 where
-    S: AsyncRead + AsyncWrite + 'static
+    S: AsyncRead + AsyncWrite + Send + 'static
 {
     type Stream = TlsStream<S>;
     type TlsConnect = RustlsConnect;
@@ -46,11 +46,11 @@ pub struct RustlsConnect {
 
 impl<S> TlsConnect<S> for RustlsConnect
 where
-    S: AsyncRead + AsyncWrite + 'static
+    S: AsyncRead + AsyncWrite + Send + 'static
 {
     type Stream = TlsStream<S>;
     type Error = io::Error;
-    type Future = Box<dyn Future<Item=(Self::Stream, ChannelBinding), Error=Self::Error>>;
+    type Future = Box<dyn Future<Item=(Self::Stream, ChannelBinding), Error=Self::Error> + Send>;
 
     fn connect(self, stream: S) -> Self::Future {
         Box::new(
@@ -59,3 +59,31 @@ where
         )
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use futures::{Future, Stream};
+    use tokio::runtime::current_thread;
+
+    #[test]
+    fn it_works() {
+        let config = rustls::ClientConfig::new();
+        let tls = super::MakeRustlsConnect::new(config);
+        current_thread::block_on_all(
+            tokio_postgres::connect("sslmode=require host=localhost user=postgres", tls)
+                .map(|(client, connection)| {
+                    tokio::spawn(
+                        connection.map_err(|e| panic!("{:?}", e))
+                    );
+                    client
+                })
+                .and_then(|mut client| {
+                    client.prepare("SELECT 1")
+                        .map(|s| (client, s))
+                })
+                .and_then(|(mut client, statement)| {
+                    client.query(&statement, &[]).collect()
+                })
+        ).unwrap();
+    }
+}
