Actually run quic benches

dignifiedquire · Dec 7, 2021 · 4168779 · 4168779
1 parent 2d46212
commit 4168779
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/golang/go.mod b/golang/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/libp2p/go-libp2p v0.14.4
 	github.com/libp2p/go-libp2p-core v0.8.6
 	github.com/libp2p/go-libp2p-noise v0.2.0
+	github.com/libp2p/go-libp2p-quic-transport v0.10.0 // indirect
 	github.com/libp2p/go-libp2p-yamux v0.5.4
 	github.com/multiformats/go-multiaddr v0.3.3
 )
diff --git a/golang/main.go b/golang/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"crypto/rand"
 	"flag"
 	"fmt"
 	"io"
@@ -15,7 +16,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/peerstore"
 	noise "github.com/libp2p/go-libp2p-noise"
-	yamux "github.com/libp2p/go-libp2p-yamux"
+	quic "github.com/libp2p/go-libp2p-quic-transport"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
@@ -29,14 +30,14 @@ func main() {
 	listenAddr := flag.String("listen-address", "", "")
 	fakeCryptoSeed := flag.Bool("fake-crypto-seed", false, "")
 	transportSecurity := flag.String(
-		"transport-security",
+		"tcp-transport-security",
 		"noise",
 		"Mechanism to secure transport, either 'noise' or 'plaintext'.",
 	)
 	flag.Parse()
 
 	if *listenAddr == "" {
-		*listenAddr = "/ip4/127.0.0.1/tcp/0"
+		*listenAddr = "/ip4/127.0.0.1/udp/0/quic"
 	}
 
 	var priv crypto.PrivKey
@@ -51,16 +52,22 @@ func main() {
 			panic(err)
 		}
 	} else {
-		priv, _, err = crypto.GenerateKeyPair(crypto.RSA, 2048)
+		priv, _, err = crypto.GenerateEd25519Key(rand.Reader)
 		if err != nil {
 			panic(err)
 		}
 	}
 
+	transport, err := quic.NewTransport(priv, nil, nil)
+	if err != nil {
+		panic(err)
+	}
+
 	opts := []libp2p.Option{
 		libp2p.ListenAddrStrings(*listenAddr),
 		libp2p.Identity(priv),
-		libp2p.Muxer("/yamux/1.0.0", yamux.DefaultTransport),
+		libp2p.Transport(transport),
+		//libp2p.Muxer("/yamux/1.0.0", yamux.DefaultTransport),
 	}
 
 	if *transportSecurity == "noise" || *transportSecurity == "" {

diff --git a/run.sh b/run.sh
@@ -12,9 +12,9 @@ trap "kill 0" EXIT
 TcpTransportSecurityProtocols=( noise plaintext )
 
 echo "# Start Rust and Golang servers."
-./rust/target/release/server --private-key-pkcs8 rust/test.pk8 --listen-address /ip4/0.0.0.0/tcp/9992 > /dev/null 2>&1 &
-./golang/go-libp2p-perf --fake-crypto-seed --listen-address /ip4/0.0.0.0/tcp/9993 --tcp-transport-security noise > /dev/null 2>&1 &
-./golang/go-libp2p-perf --fake-crypto-seed --listen-address /ip4/0.0.0.0/tcp/9994 --tcp-transport-security plaintext > /dev/null 2>&1 &
+./rust/target/release/server --private-key-pkcs8 rust/test.pk8 --listen-address /ip4/127.0.0.1/udp/9992/quic > /dev/null 2>&1 &
+./golang/go-libp2p-perf --fake-crypto-seed --listen-address /ip4/0.0.0.0/udp/9993/quic --tcp-transport-security noise > /dev/null 2>&1 &
+./golang/go-libp2p-perf --fake-crypto-seed --listen-address /ip4/0.0.0.0/udp/9994/quic --tcp-transport-security plaintext > /dev/null 2>&1 &
 
 sleep 1
 
@@ -24,33 +24,33 @@ for Protocol in ${TcpTransportSecurityProtocols[*]}
 do
     echo
     echo "## Transport security $Protocol"
-    ./rust/target/release/client --server-address /ip4/127.0.0.1/tcp/9992 --tcp-transport-security $Protocol
+    ./rust/target/release/client --server-address /ip4/127.0.0.1/udp/9992/quic --tcp-transport-security $Protocol
 done
 
-echo
-echo "# Rust -> Golang"
-echo
-echo "## Transport security noise"
-./rust/target/release/client --server-address /ip4/127.0.0.1/tcp/9993 --tcp-transport-security noise
-echo
-echo "## Transport security plaintext"
-./rust/target/release/client --server-address /ip4/127.0.0.1/tcp/9994 --tcp-transport-security plaintext
-
-echo
-echo "# Golang -> Rust"
-for Protocol in ${TcpTransportSecurityProtocols[*]}
-do
-    echo
-    echo "## Transport security $Protocol"
-    ./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/tcp/9992/p2p/Qmcqq9TFaYbb94uwdER1BXyGfCFY4Bb1gKozxNyVvLvTSw --tcp-transport-security $Protocol
-done
+# echo
+# echo "# Rust -> Golang"
+# echo
+# echo "## Transport security noise"
+# ./rust/target/release/client --server-address /ip4/127.0.0.1/udp/9993/quic --tcp-transport-security noise
+# echo
+# echo "## Transport security plaintext"
+# ./rust/target/release/client --server-address /ip4/127.0.0.1/udp/9994/quic --tcp-transport-security plaintext
+
+# echo
+# echo "# Golang -> Rust"
+# for Protocol in ${TcpTransportSecurityProtocols[*]}
+# do
+#     echo
+#     echo "## Transport security $Protocol"
+#     ./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/tcp/9992/p2p/Qmcqq9TFaYbb94uwdER1BXyGfCFY4Bb1gKozxNyVvLvTSw --tcp-transport-security $Protocol
+# done
 
 echo
 echo "# Golang -> Golang"
 echo
 echo "## Transport security noise"
-./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/tcp/9993/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw --tcp-transport-security noise
+./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/udp/9993/quic/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw --tcp-transport-security noise
 echo
 echo "## Transport security plaintext"
-./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/tcp/9994/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw --tcp-transport-security plaintext
+./golang/go-libp2p-perf --server-address /ip4/127.0.0.1/udp/9994/quic/p2p/12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw --tcp-transport-security plaintext
 
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -197,7 +197,7 @@ mod tests {
             let key = identity::Keypair::generate_ed25519();
             let local_peer_id = PeerId::from(key.public());
 
-            let transport = build_transport(key, TcpTransportSecurity::Plaintext).unwrap();
+            let transport = build_transport(key, TcpTransportSecurity::Plaintext, None).unwrap();
             let perf = Perf::default();
             Swarm::new(transport, perf, local_peer_id)
         };
@@ -206,7 +206,7 @@ mod tests {
             let key = identity::Keypair::generate_ed25519();
             let local_peer_id = PeerId::from(key.public());
 
-            let transport = build_transport(key, TcpTransportSecurity::Plaintext).unwrap();
+            let transport = build_transport(key, TcpTransportSecurity::Plaintext, None).unwrap();
             let perf = Perf::default();
             Swarm::new(transport, perf, local_peer_id)
         };