From ddc900a93c6f97421495b4f05d84f120d982a83f Mon Sep 17 00:00:00 2001
From: Sergey Cherepanov <cheggaaa@gmail.com>
Date: Tue, 6 Jun 2023 20:45:18 +0200
Subject: [PATCH] yamux fixes

---
 net/transport/yamux/config.go     | 1 -
 net/transport/yamux/conn.go       | 4 ++--
 net/transport/yamux/yamux.go      | 3 ---
 net/transport/yamux/yamux_test.go | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/net/transport/yamux/config.go b/net/transport/yamux/config.go
index 38f74d4b..2afce5fd 100644
--- a/net/transport/yamux/config.go
+++ b/net/transport/yamux/config.go
@@ -8,5 +8,4 @@ type Config struct {
 	ListenAddrs     []string `yaml:"listenAddrs"`
 	WriteTimeoutSec int      `yaml:"writeTimeoutSec"`
 	DialTimeoutSec  int      `yaml:"dialTimeoutSec"`
-	MaxStreams      int      `yaml:"maxStreams"`
 }
diff --git a/net/transport/yamux/conn.go b/net/transport/yamux/conn.go
index 26a6f3f2..c752d22d 100644
--- a/net/transport/yamux/conn.go
+++ b/net/transport/yamux/conn.go
@@ -29,7 +29,7 @@ func (y *yamuxConn) Open(ctx context.Context) (conn net.Conn, err error) {
 	if conn, err = y.Session.Open(); err != nil {
 		return
 	}
-	return connutil.NewTimeout(conn, time.Second*10), nil
+	return
 }
 
 func (y *yamuxConn) LastUsage() time.Time {
@@ -51,5 +51,5 @@ func (y *yamuxConn) Accept() (conn net.Conn, err error) {
 		}
 		return
 	}
-	return connutil.NewTimeout(conn, time.Second*10), nil
+	return
 }
diff --git a/net/transport/yamux/yamux.go b/net/transport/yamux/yamux.go
index c0f85777..18558604 100644
--- a/net/transport/yamux/yamux.go
+++ b/net/transport/yamux/yamux.go
@@ -43,9 +43,6 @@ func (y *yamuxTransport) Init(a *app.App) (err error) {
 	y.secure = a.MustComponent(secureservice.CName).(secureservice.SecureService)
 	y.conf = a.MustComponent("config").(configGetter).GetYamux()
 	y.yamuxConf = yamux.DefaultConfig()
-	if y.conf.MaxStreams > 0 {
-		y.yamuxConf.AcceptBacklog = y.conf.MaxStreams
-	}
 	y.yamuxConf.EnableKeepAlive = false
 	y.yamuxConf.StreamOpenTimeout = time.Duration(y.conf.DialTimeoutSec) * time.Second
 	y.yamuxConf.ConnectionWriteTimeout = time.Duration(y.conf.WriteTimeoutSec) * time.Second
diff --git a/net/transport/yamux/yamux_test.go b/net/transport/yamux/yamux_test.go
index 1a67ed25..02e1c322 100644
--- a/net/transport/yamux/yamux_test.go
+++ b/net/transport/yamux/yamux_test.go
@@ -173,7 +173,6 @@ func (c *testConf) GetYamux() Config {
 		ListenAddrs:     []string{"127.0.0.1:0"},
 		WriteTimeoutSec: 10,
 		DialTimeoutSec:  10,
-		MaxStreams:      1024,
 	}
 }