adapt tests

crates/harness/executor/src/bench/verifier.rs

@@ -1,9 +1,10 @@
 use anyhow::Result;
 
+use futures::TryFutureExt;
 use harness_core::bench::Bench;
 use tlsn::{
     config::verifier::VerifierConfig,
-    verifier::Verifier,
+    verifier::{Verifier, VerifierError},
     webpki::{CertificateDer, RootCertStore},
 };
 use tlsn_server_fixture_certs::CA_CERT_DER;
@@ -19,15 +20,16 @@ pub async fn bench_verifier(provider: &IoProvider, _config: &Bench) -> Result<()
             .build()?,
     );
 
-    let verifier = verifier
-        .commit(provider.provide_proto_io().await?)
-        .await?
-        .accept()
-        .await?
-        .run()
-        .await?;
-    let (_, verifier) = verifier.verify().await?.accept().await?;
-    verifier.close().await?;
+    let mut prover_io = provider.provide_proto_io().await?;
+    let (mpc_conn, verifier) = verifier.commit_with(&mut prover_io).await?;
 
+    let mpc_fut = mpc_conn.into_future(prover_io).map_err(VerifierError::from);
+    let verifier = async {
+        let verifier = verifier.accept().await?.run().await?;
+        let (_, verifier) = verifier.verify().await?.accept().await?;
+        verifier.close().await
+    };
+
+    futures::try_join!(mpc_fut, verifier);
     Ok(())
 }

crates/tlsn/src/conn/mpc.rs

@@ -170,7 +170,7 @@ where
                 if read > 0 {
                     this.write_buf.extend(&tmp_write_buf[..read]);
                 } else {
-                    return this.duplex.as_mut().poll_close(cx);
+                    return this.socket.as_mut().poll_close(cx);
                 }
             }
 

crates/tlsn/src/verifier.rs

@@ -68,7 +68,7 @@ impl Verifier<state::Initialized> {
     ///
     /// * `socket` - The socket to the prover.
     #[instrument(parent = &self.span, level = "info", skip_all, err)]
-    pub async fn commit(
+    pub fn commit(
         self,
     ) -> Result<MpcSetup<Verifier<state::CommitStart>, VerifierError>, VerifierError> {
         let (duplex_a, duplex_b) = futures_plex::duplex(BUF_CAP);

crates/tlsn/tests/test.rs

@@ -1,4 +1,4 @@
-use futures::{AsyncReadExt, AsyncWriteExt};
+use futures::{AsyncReadExt, AsyncWriteExt, TryFutureExt};
 use rangeset::RangeSet;
 use tlsn::{
     config::{
@@ -15,7 +15,7 @@ use tlsn::{
         Direction, Transcript, TranscriptCommitConfig, TranscriptCommitment,
         TranscriptCommitmentKind, TranscriptSecret,
     },
-    verifier::{Verifier, VerifierOutput},
+    verifier::{Verifier, VerifierError, VerifierOutput},
     webpki::{CertificateDer, RootCertStore},
 };
 use tlsn_core::ProverOutput;
@@ -215,7 +215,7 @@ async fn prover<T: AsyncWrite + AsyncRead + Send + Unpin + 'static>(
 
 #[instrument(skip(socket))]
 async fn verifier<T: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
-    socket: T,
+    mut socket: T,
 ) -> VerifierOutput {
     let verifier = Verifier::new(
         VerifierConfig::builder()
@@ -226,19 +226,19 @@ async fn verifier<T: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
             .unwrap(),
     );
 
-    let verifier = verifier
-        .commit(socket.compat())
-        .await
-        .unwrap()
-        .accept()
-        .await
-        .unwrap()
-        .run()
-        .await
-        .unwrap();
+    let (mpc_conn, verifier) = verifier.commit_with((&mut socket).compat()).await.unwrap();
 
-    let (output, verifier) = verifier.verify().await.unwrap().accept().await.unwrap();
-    verifier.close().await.unwrap();
+    let mpc_fut = mpc_conn
+        .into_future(socket.compat())
+        .map_err(VerifierError::from);
 
+    let verifier = async {
+        let verifier = verifier.accept().await?.run().await?;
+        let (output, verifier) = verifier.verify().await?.accept().await?;
+        verifier.close().await?;
+        Ok(output)
+    };
+
+    let (_, output) = futures::try_join!(mpc_fut, verifier).unwrap();
     output
 }