fix harness and downgrade spansy for now

Cargo.lock

@@ -4407,7 +4407,7 @@ dependencies = [
  "mpz-vm-core",
  "opaque-debug",
  "rand 0.9.2",
- "rangeset 0.2.0",
+ "rangeset",
  "serde",
  "serio",
  "thiserror 1.0.69",
@@ -4438,7 +4438,7 @@ dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "rangeset 0.2.0",
+ "rangeset",
  "rayon",
  "serde",
  "serde_arrays",
@@ -4470,7 +4470,7 @@ dependencies = [
  "mpz-core",
  "mpz-memory-core",
  "mpz-vm-core",
- "rangeset 0.2.0",
+ "rangeset",
  "serde",
  "serio",
  "thiserror 1.0.69",
@@ -4486,7 +4486,7 @@ dependencies = [
  "itybity 0.3.1",
  "mpz-core",
  "rand 0.9.2",
- "rangeset 0.2.0",
+ "rangeset",
  "serde",
  "thiserror 1.0.69",
 ]
@@ -4652,7 +4652,7 @@ dependencies = [
  "mpz-core",
  "mpz-memory-core",
  "mpz-vm-core",
- "rangeset 0.2.0",
+ "rangeset",
  "rayon",
  "serde",
  "thiserror 1.0.69",
@@ -5754,15 +5754,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "rangeset"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b8fabf401336b2b589357541d5d8422c90c689bbd0a30e78c929799111f657"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "rayon"
 version = "1.11.0"
@@ -6815,13 +6806,13 @@ dependencies = [
 [[package]]
 name = "spansy"
 version = "0.1.0"
-source = "git+https://github.com/tlsnotary/tlsn-utils?rev=1e5595eb#1e5595eb9fada7e29eab82735ad60c5ff57f2ba5"
+source = "git+https://github.com/tlsnotary/tlsn-utils?rev=6168663#6168663495281f2c1b2c1734dc276cecc4d36ef1"
 dependencies = [
  "bytes",
  "httparse",
  "pest",
  "pest_derive",
- "rangeset 0.3.0",
+ "rangeset",
  "serde",
  "thiserror 1.0.69",
 ]
@@ -7218,7 +7209,7 @@ dependencies = [
  "opaque-debug",
  "pin-project-lite",
  "rand 0.9.2",
- "rangeset 0.2.0",
+ "rangeset",
  "rstest",
  "rustls-pki-types",
  "rustls-webpki 0.103.7",
@@ -7300,7 +7291,7 @@ dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "rangeset 0.2.0",
+ "rangeset",
  "rs_merkle",
  "rstest",
  "rustls-pki-types",
@@ -7333,7 +7324,7 @@ dependencies = [
  "mpz-core",
  "mpz-ideal-vm",
  "mpz-vm-core",
- "rangeset 0.2.0",
+ "rangeset",
  "serde",
  "serio",
  "thiserror 1.0.69",

Cargo.toml

@@ -83,7 +83,7 @@ mpz-ideal-vm = { git = "https://github.com/privacy-ethereum/mpz", rev = "bd80826
 futures-plex = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "1e5595eb" }
 rangeset = { version = "0.2" }
 serio = { version = "0.2" }
-spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "1e5595eb" }
+spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "6168663" }
 uid-mux = { version = "0.2" }
 websocket-relay = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "1e5595eb" }
 

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

@@ -30,6 +30,6 @@ pub async fn bench_verifier(provider: &IoProvider, _config: &Bench) -> Result<()
         verifier.close().await
     };
 
-    futures::try_join!(mpc_fut, verifier);
+    futures::try_join!(mpc_fut, verifier).unwrap();
     Ok(())
 }

crates/harness/executor/test_plugins/basic.rs

@@ -1,3 +1,4 @@
+use futures::TryFutureExt;
 use tlsn::{
     config::{
         prove::ProveConfig,
@@ -10,7 +11,7 @@ use tlsn::{
     hash::HashAlgId,
     prover::Prover,
     transcript::{TranscriptCommitConfig, TranscriptCommitment, TranscriptCommitmentKind},
-    verifier::{Verifier, VerifierOutput},
+    verifier::{Verifier, VerifierError, VerifierOutput},
     webpki::{CertificateDer, RootCertStore},
 };
 use tlsn_server_fixture_certs::{CA_CERT_DER, SERVER_DOMAIN};
@@ -130,27 +131,27 @@ async fn verifier(provider: &IoProvider) {
         .build()
         .unwrap();
 
-    let verifier = Verifier::new(config)
-        .commit(provider.provide_proto_io().await.unwrap())
-        .await
-        .unwrap()
-        .accept()
-        .await
-        .unwrap()
-        .run()
-        .await
-        .unwrap();
+    let mut prover_io = provider.provide_proto_io().await.unwrap();
+    let verifier = Verifier::new(config);
+
+    let (mpc_conn, verifier) = verifier.commit_with(&mut prover_io).await.unwrap();
+    let mpc_fut = mpc_conn.into_future(prover_io).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 (
+        _,
         VerifierOutput {
             server_name,
             transcript_commitments,
             ..
         },
-        verifier,
-    ) = verifier.verify().await.unwrap().accept().await.unwrap();
-
-    verifier.close().await.unwrap();
+    ) = futures::try_join!(mpc_fut, verifier).unwrap();
 
     let ServerName::Dns(server_name) = server_name.unwrap();