From 70ff509617574f0dea22b3a41c5f9d2233e79363 Mon Sep 17 00:00:00 2001
From: Christopher Chong <t.kleinchong@gmail.com>
Date: Tue, 17 Oct 2023 15:39:43 +0900
Subject: [PATCH 1/2] Modify url parsing and readme.

---
 notary-server/README.md             |  1 +
 tlsn/examples/discord/discord_dm.rs | 18 ++++--------------
 tlsn/examples/twitter/twitter_dm.rs | 18 ++++--------------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/notary-server/README.md b/notary-server/README.md
index 3b0bc8fee9..67f74eef43 100644
--- a/notary-server/README.md
+++ b/notary-server/README.md
@@ -38,6 +38,7 @@ docker run --init -p 127.0.0.1:7047:7047 ghcr.io/tlsnotary/tlsn/notary-server:la
 ```bash
 docker run --init -p 127.0.0.1:7047:7047 -v <your config folder path>:/root/.notary-server/config ghcr.io/tlsnotary/tlsn/notary-server:latest
 ```
+P/S: When running this notary-server image against a [prover](https://github.com/tlsnotary/tlsn/tree/dev/tlsn/examples), please ensure that the prover's tagged version is the same as the version tag of this image.
 
 #### Building from source
 1. Configure the server setting in this config [file](./config/config.yaml).
diff --git a/tlsn/examples/discord/discord_dm.rs b/tlsn/examples/discord/discord_dm.rs
index 1ba93ab490..1f340befc1 100644
--- a/tlsn/examples/discord/discord_dm.rs
+++ b/tlsn/examples/discord/discord_dm.rs
@@ -6,14 +6,7 @@ use futures::AsyncWriteExt;
 use hyper::{body::to_bytes, client::conn::Parts, Body, Request, StatusCode};
 use rustls::{Certificate, ClientConfig, RootCertStore};
 use serde::{Deserialize, Serialize};
-use std::{
-    env,
-    fs::File as StdFile,
-    io::BufReader,
-    net::{IpAddr, SocketAddr},
-    ops::Range,
-    sync::Arc,
-};
+use std::{env, fs::File as StdFile, io::BufReader, ops::Range, sync::Arc};
 use tlsn_core::proof::TlsProof;
 use tokio::{fs::File, io::AsyncWriteExt as _, net::TcpStream};
 use tokio_rustls::TlsConnector;
@@ -221,12 +214,9 @@ async fn setup_notary_connection() -> (tokio_rustls::client::TlsStream<TcpStream
         .with_no_client_auth();
     let notary_connector = TlsConnector::from(Arc::new(client_notary_config));
 
-    let notary_socket = tokio::net::TcpStream::connect(SocketAddr::new(
-        IpAddr::V4(NOTARY_HOST.parse().unwrap()),
-        NOTARY_PORT,
-    ))
-    .await
-    .unwrap();
+    let notary_socket = tokio::net::TcpStream::connect((NOTARY_HOST, NOTARY_PORT))
+        .await
+        .unwrap();
 
     let notary_tls_socket = notary_connector
         // Require the domain name of notary server to be the same as that in the server cert
diff --git a/tlsn/examples/twitter/twitter_dm.rs b/tlsn/examples/twitter/twitter_dm.rs
index 1302db11fd..03c57f2555 100644
--- a/tlsn/examples/twitter/twitter_dm.rs
+++ b/tlsn/examples/twitter/twitter_dm.rs
@@ -6,14 +6,7 @@ use futures::AsyncWriteExt;
 use hyper::{body::to_bytes, client::conn::Parts, Body, Request, StatusCode};
 use rustls::{Certificate, ClientConfig, RootCertStore};
 use serde::{Deserialize, Serialize};
-use std::{
-    env,
-    fs::File as StdFile,
-    io::BufReader,
-    net::{IpAddr, SocketAddr},
-    ops::Range,
-    sync::Arc,
-};
+use std::{env, fs::File as StdFile, io::BufReader, ops::Range, sync::Arc};
 use tokio::{fs::File, io::AsyncWriteExt as _, net::TcpStream};
 use tokio_rustls::TlsConnector;
 use tokio_util::compat::{FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt};
@@ -210,12 +203,9 @@ async fn setup_notary_connection() -> (tokio_rustls::client::TlsStream<TcpStream
         .with_no_client_auth();
     let notary_connector = TlsConnector::from(Arc::new(client_notary_config));
 
-    let notary_socket = tokio::net::TcpStream::connect(SocketAddr::new(
-        IpAddr::V4(NOTARY_HOST.parse().unwrap()),
-        NOTARY_PORT,
-    ))
-    .await
-    .unwrap();
+    let notary_socket = tokio::net::TcpStream::connect((NOTARY_HOST, NOTARY_PORT))
+        .await
+        .unwrap();
 
     let notary_tls_socket = notary_connector
         // Require the domain name of notary server to be the same as that in the server cert

From c1568048723c61d768ef1a380b2d5559d0fd8b14 Mon Sep 17 00:00:00 2001
From: Christopher Chong <t.kleinchong@gmail.com>
Date: Tue, 17 Oct 2023 15:46:56 +0900
Subject: [PATCH 2/2] Modify README.

---
 notary-server/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notary-server/README.md b/notary-server/README.md
index 67f74eef43..8a25eee90d 100644
--- a/notary-server/README.md
+++ b/notary-server/README.md
@@ -38,7 +38,7 @@ docker run --init -p 127.0.0.1:7047:7047 ghcr.io/tlsnotary/tlsn/notary-server:la
 ```bash
 docker run --init -p 127.0.0.1:7047:7047 -v <your config folder path>:/root/.notary-server/config ghcr.io/tlsnotary/tlsn/notary-server:latest
 ```
-P/S: When running this notary-server image against a [prover](https://github.com/tlsnotary/tlsn/tree/dev/tlsn/examples), please ensure that the prover's tagged version is the same as the version tag of this image.
+P/S: When running this notary-server image against a [prover](https://github.com/tlsnotary/tlsn/tree/3e0dcc77d5b8b7d6739ca725f36345108ebecd75/tlsn/examples), please ensure that the prover's tagged version is the same as the version tag of this image.
 
 #### Building from source
 1. Configure the server setting in this config [file](./config/config.yaml).