From 566d37ec0130abcc99839a67e23cf73744ca9121 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 9 Jun 2020 13:41:17 +0100
Subject: [PATCH] Updates

---
 cmd/dendrite-demo-yggdrasil/main.go           |  8 ++---
 cmd/dendrite-demo-yggdrasil/yggconn/stream.go | 32 -------------------
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 cmd/dendrite-demo-yggdrasil/yggconn/stream.go

diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go
index 873c70dba..bdc75e8f1 100644
--- a/cmd/dendrite-demo-yggdrasil/main.go
+++ b/cmd/dendrite-demo-yggdrasil/main.go
@@ -72,15 +72,11 @@ func createFederationClient(
 	yggdialerctx := func(ctx context.Context, network, address string) (net.Conn, error) {
 		return yggdialer(network, address)
 	}
-
-	tr := &http.Transport{
-		MaxConnsPerHost: 1,
-	}
+	tr := &http.Transport{}
 	tr.RegisterProtocol(
 		"matrix", &yggroundtripper{
 			inner: &http.Transport{
-				DialContext:     yggdialerctx,
-				MaxConnsPerHost: 1,
+				DialContext: yggdialerctx,
 			},
 		},
 	)
diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/stream.go b/cmd/dendrite-demo-yggdrasil/yggconn/stream.go
deleted file mode 100644
index 6c3d06639..000000000
--- a/cmd/dendrite-demo-yggdrasil/yggconn/stream.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package yggconn
-
-import (
-	"github.com/libp2p/go-yamux"
-)
-
-type stream struct {
-	*yamux.Stream
-	//conn net.Conn
-}
-
-/*
-func (c *stream) LocalAddr() net.Addr {
-	return c.LocalAddr()
-}
-
-func (c *stream) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-func (c *stream) SetDeadline(t time.Time) error {
-	return c.conn.SetDeadline(t)
-}
-
-func (c *stream) SetReadDeadline(t time.Time) error {
-	return c.conn.SetReadDeadline(t)
-}
-
-func (c *stream) SetWriteDeadline(t time.Time) error {
-	return c.conn.SetWriteDeadline(t)
-}
-*/