From 00f48174e903c8537accc55f9928ff9973e286fc Mon Sep 17 00:00:00 2001
From: Sir Darkrengarius <darkren92@gmail.com>
Date: Mon, 23 Dec 2019 15:47:59 +0300
Subject: [PATCH] Remove custom timeout timer

---
 go.mod                    |  2 +-
 pkg/router/route_group.go | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/go.mod b/go.mod
index 7ce3b0da9f..eff170c4f2 100644
--- a/go.mod
+++ b/go.mod
@@ -24,4 +24,4 @@ require (
 	golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a
 )
 
-// replace github.com/SkycoinProject/dmsg => ../dmsg
+replace github.com/SkycoinProject/dmsg => ../dmsg
diff --git a/pkg/router/route_group.go b/pkg/router/route_group.go
index d3bea35be8..9d37198479 100644
--- a/pkg/router/route_group.go
+++ b/pkg/router/route_group.go
@@ -21,7 +21,6 @@ import (
 
 const (
 	defaultRouteGroupKeepAliveInterval = 1 * time.Minute
-	defaultRouteGroupIOTimeout         = 3 * time.Second
 	defaultReadChBufSize               = 1024
 )
 
@@ -46,7 +45,6 @@ func (timeoutError) Temporary() bool { return true }
 type RouteGroupConfig struct {
 	ReadChBufSize     int
 	KeepAliveInterval time.Duration
-	IOTimeout         time.Duration
 }
 
 // DefaultRouteGroupConfig returns default RouteGroup config.
@@ -54,7 +52,6 @@ type RouteGroupConfig struct {
 func DefaultRouteGroupConfig() *RouteGroupConfig {
 	return &RouteGroupConfig{
 		KeepAliveInterval: defaultRouteGroupKeepAliveInterval,
-		IOTimeout:         defaultRouteGroupIOTimeout,
 		ReadChBufSize:     defaultReadChBufSize,
 	}
 }
@@ -149,15 +146,10 @@ func (rg *RouteGroup) Read(p []byte) (n int, err error) {
 	}
 	rg.mu.Unlock()
 
-	timeout := time.NewTimer(rg.cfg.IOTimeout)
-	defer timeout.Stop()
-
 	var data []byte
 	select {
 	case <-rg.readDeadline.Wait():
 		return 0, timeoutError{}
-	case <-timeout.C:
-		return 0, io.EOF
 	case data = <-rg.readCh:
 	}
 
@@ -200,14 +192,9 @@ func (rg *RouteGroup) Write(p []byte) (n int, err error) {
 	errCh, cancel := rg.writePacketAsync(tp, packet)
 	defer cancel()
 
-	timeout := time.NewTimer(rg.cfg.IOTimeout)
-	defer timeout.Stop()
-
 	select {
 	case <-rg.writeDeadline.Wait():
 		return 0, timeoutError{}
-	case <-timeout.C:
-		return 0, io.EOF
 	case err := <-errCh:
 		if err != nil {
 			return 0, err