Merge pull request #381 from SkycoinProject/fix/setup-node-hangs

Improve reliability and logging of setup node.

Former-commit-id: 0b19237

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 go:
-  # - "1.13.x" At minimum the code should run make check on the latest two go versions in the default linux environment provided by Travis.
-  - "1.13.x"
+  # - "1.14.x" At minimum the code should run make check on the latest two go versions in the default linux environment provided by Travis.
+  - "1.14.x"
 
 dist: xenial
 
@@ -19,6 +19,7 @@ before_install:
 install:
   - go get -u github.com/FiloSottile/vendorcheck
   - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.27.0
+  - make tidy
 
 before_script:
   - ci_scripts/create-ip-aliases.sh

cmd/setup-node/commands/root.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"bufio"
+	"context"
 	"encoding/json"
 	"io"
 	"io/ioutil"
@@ -10,6 +11,7 @@ import (
 	"os"
 
 	"github.com/SkycoinProject/dmsg/buildinfo"
+	"github.com/SkycoinProject/dmsg/cmdutil"
 	"github.com/SkycoinProject/skycoin/src/util/logging"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
@@ -87,7 +89,10 @@ var rootCmd = &cobra.Command{
 			}
 		}()
 
-		logger.Fatal(sn.Serve())
+		ctx, cancel := cmdutil.SignalContext(context.Background(), logger)
+		defer cancel()
+
+		logger.Fatal(sn.Serve(ctx))
 	},
 }
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/SkycoinProject/skywire-mainnet
 
-go 1.13
+go 1.14
 
 require (
 	github.com/SkycoinProject/dmsg v0.2.2
@@ -10,9 +10,9 @@ require (
 	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/securecookie v1.1.1
-	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
 	github.com/libp2p/go-reuseport v0.0.1
 	github.com/mholt/archiver/v3 v3.3.0
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/profile v1.3.0
 	github.com/prometheus/client_golang v1.3.0
 	github.com/prometheus/common v0.7.0
@@ -23,9 +23,7 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.5.1
 	go.etcd.io/bbolt v1.3.4
-	golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc // indirect
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
-	golang.org/x/sys v0.0.0-20200428200454-593003d681fa // indirect
 	golang.zx2c4.com/wireguard v0.0.20200320
 	nhooyr.io/websocket v1.8.2
 )

go.sum

@@ -118,9 +118,8 @@ github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo
 github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM=
 github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
@@ -166,6 +165,8 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.3.0 h1:OQIvuDgm00gWVWGTf4m4mCt6W1/0YqU7Ntg0mySWgaI=
 github.com/pkg/profile v1.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -221,7 +222,6 @@ github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -247,9 +247,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc h1:ZGI/fILM2+ueot/UixBSoj9188jCAxVHEZEGhqq67I4=
-golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -286,9 +285,8 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA=
-golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -313,7 +311,6 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

pkg/routefinder/rfclient/client.go

@@ -46,7 +46,7 @@ type HTTPError struct {
 
 // Client implements route finding operations.
 type Client interface {
-	FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][]routing.Path, error)
+	FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][][]routing.Hop, error)
 }
 
 // APIClient implements Client interface
@@ -71,7 +71,7 @@ func NewHTTP(addr string, apiTimeout time.Duration) Client {
 
 // FindRoutes returns routes from source skywire visor to destiny, that has at least the given minHops and as much
 // the given maxHops as well as the reverse routes from destiny to source.
-func (c *apiClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][]routing.Path, error) {
+func (c *apiClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][][]routing.Hop, error) {
 	requestBody := &FindRoutesRequest{
 		Edges: rts,
 		Opts:  opts,
@@ -113,7 +113,7 @@ func (c *apiClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, opt
 		return nil, errors.New(apiErr.Error.Message)
 	}
 
-	var paths map[routing.PathEdges][]routing.Path
+	var paths map[routing.PathEdges][][]routing.Hop
 	err = json.NewDecoder(res.Body).Decode(&paths)
 	if err != nil {
 		return nil, err

pkg/routefinder/rfclient/mock.go

@@ -27,7 +27,7 @@ func (r *mockClient) SetError(err error) {
 }
 
 // FindRoutes implements Client for MockClient
-func (r *mockClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][]routing.Path, error) {
+func (r *mockClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, opts *RouteOptions) (map[routing.PathEdges][][]routing.Hop, error) {
 	if r.err != nil {
 		return nil, r.err
 	}
@@ -36,7 +36,7 @@ func (r *mockClient) FindRoutes(ctx context.Context, rts []routing.PathEdges, op
 		return nil, fmt.Errorf("no edges provided to returns routes from")
 	}
 
-	return map[routing.PathEdges][]routing.Path{
+	return map[routing.PathEdges][][]routing.Hop{
 		[2]cipher.PubKey{rts[0][0], rts[0][1]}: {
 			{
 				routing.Hop{

pkg/router/router.go

@@ -386,15 +386,15 @@ func (r *router) handleDataPacket(ctx context.Context, packet routing.Packet) er
 		return err
 	}
 
-	if rule.Type() == routing.RuleConsume {
+	if rule.Type() == routing.RuleReverse {
 		r.logger.Debugf("Handling packet of type %s with route ID %d", packet.Type(), packet.RouteID())
 	} else {
 		r.logger.Debugf("Handling packet of type %s with route ID %d and next ID %d", packet.Type(),
 			packet.RouteID(), rule.NextRouteID())
 	}
 
 	switch rule.Type() {
-	case routing.RuleForward, routing.RuleIntermediaryForward:
+	case routing.RuleForward, routing.RuleIntermediary:
 		r.logger.Infoln("Handling intermediary data packet")
 		return r.forwardPacket(ctx, packet, rule)
 	}
@@ -429,7 +429,7 @@ func (r *router) handleClosePacket(ctx context.Context, packet routing.Packet) e
 		return err
 	}
 
-	if rule.Type() == routing.RuleConsume {
+	if rule.Type() == routing.RuleReverse {
 		r.logger.Debugf("Handling packet of type %s with route ID %d", packet.Type(), packet.RouteID())
 	} else {
 		r.logger.Debugf("Handling packet of type %s with route ID %d and next ID %d", packet.Type(),
@@ -441,7 +441,7 @@ func (r *router) handleClosePacket(ctx context.Context, packet routing.Packet) e
 		r.rt.DelRules(routeIDs)
 	}()
 
-	if t := rule.Type(); t == routing.RuleIntermediaryForward {
+	if t := rule.Type(); t == routing.RuleIntermediary {
 		r.logger.Infoln("Handling intermediary close packet")
 		return r.forwardPacket(ctx, packet, rule)
 	}
@@ -489,7 +489,7 @@ func (r *router) handleKeepAlivePacket(ctx context.Context, packet routing.Packe
 		return err
 	}
 
-	if rule.Type() == routing.RuleConsume {
+	if rule.Type() == routing.RuleReverse {
 		r.logger.Debugf("Handling packet of type %s with route ID %d", packet.Type(), packet.RouteID())
 	} else {
 		r.logger.Debugf("Handling packet of type %s with route ID %d and next ID %d", packet.Type(),
@@ -498,7 +498,7 @@ func (r *router) handleKeepAlivePacket(ctx context.Context, packet routing.Packe
 
 	// propagate packet only for intermediary rule. forward rule workflow doesn't get here,
 	// consume rules should be omitted, activity is already updated
-	if t := rule.Type(); t == routing.RuleIntermediaryForward {
+	if t := rule.Type(); t == routing.RuleIntermediary {
 		r.logger.Infoln("Handling intermediary keep-alive packet")
 		return r.forwardPacket(ctx, packet, rule)
 	}
@@ -605,7 +605,7 @@ func (r *router) forwardPacket(ctx context.Context, packet routing.Packet, rule
 func (r *router) RemoveRouteDescriptor(desc routing.RouteDescriptor) {
 	rules := r.rt.AllRules()
 	for _, rule := range rules {
-		if rule.Type() != routing.RuleConsume {
+		if rule.Type() != routing.RuleReverse {
 			continue
 		}
 
@@ -617,7 +617,7 @@ func (r *router) RemoveRouteDescriptor(desc routing.RouteDescriptor) {
 	}
 }
 
-func (r *router) fetchBestRoutes(src, dst cipher.PubKey, opts *DialOptions) (fwd, rev routing.Path, err error) {
+func (r *router) fetchBestRoutes(src, dst cipher.PubKey, opts *DialOptions) (fwd, rev []routing.Hop, err error) {
 	// TODO(nkryuchkov): use opts
 	if opts == nil {
 		opts = DefaultDialOptions() // nolint
@@ -802,7 +802,7 @@ func (r *router) removeRouteGroupOfRule(rule routing.Rule) {
 	// we need to process only consume rules, cause we don't
 	// really care about the other ones, other rules removal
 	// doesn't affect our work here
-	if rule.Type() != routing.RuleConsume {
+	if rule.Type() != routing.RuleReverse {
 		log.
 			WithField("func", "removeRouteGroupOfRule").
 			WithField("rule", rule.Type().String()).

pkg/router/routerclient/client.go

@@ -2,75 +2,77 @@ package routerclient
 
 import (
 	"context"
+	"fmt"
+	"io"
 	"net/rpc"
 
 	"github.com/SkycoinProject/dmsg/cipher"
+	"github.com/SkycoinProject/skycoin/src/util/logging"
+	"github.com/sirupsen/logrus"
 
 	"github.com/SkycoinProject/skywire-mainnet/pkg/routing"
 	"github.com/SkycoinProject/skywire-mainnet/pkg/snet"
 )
 
-const rpcName = "RPCGateway"
+// RPCName is the RPC gateway object name.
+const RPCName = "RPCGateway"
 
-// Client is an RPC client for router.
+// Client is used to interact with the router's API remotely. The setup node uses this.
 type Client struct {
 	rpc *rpc.Client
+	rPK cipher.PubKey // public key of remote router
+	log logrus.FieldLogger
 }
 
 // NewClient creates a new Client.
-func NewClient(ctx context.Context, dialer snet.Dialer, pk cipher.PubKey) (*Client, error) {
-	s, err := dialer.Dial(ctx, pk, snet.AwaitSetupPort)
+func NewClient(ctx context.Context, dialer snet.Dialer, rPK cipher.PubKey) (*Client, error) {
+	s, err := dialer.Dial(ctx, rPK, snet.AwaitSetupPort)
 	if err != nil {
 		return nil, err
 	}
+	return NewClientFromRaw(s, rPK), nil
+}
 
-	client := &Client{
-		rpc: rpc.NewClient(s),
+// NewClientFromRaw creates a new client from a raw connection.
+func NewClientFromRaw(conn io.ReadWriteCloser, rPK cipher.PubKey) *Client {
+	return &Client{
+		rpc: rpc.NewClient(conn),
+		rPK: rPK,
+		log: logging.MustGetLogger(fmt.Sprintf("router_client:%s", rPK.String())),
 	}
-
-	return client, nil
 }
 
 // Close closes a Client.
 func (c *Client) Close() error {
 	if c == nil {
 		return nil
 	}
-
-	if err := c.rpc.Close(); err != nil {
-		return err
-	}
-
-	return nil
+	return c.rpc.Close()
 }
 
 // AddEdgeRules adds forward and consume rules to router (forward and reverse).
-func (c *Client) AddEdgeRules(ctx context.Context, rules routing.EdgeRules) (bool, error) {
-	var ok bool
-	err := c.call(ctx, rpcName+".AddEdgeRules", rules, &ok)
-
+func (c *Client) AddEdgeRules(ctx context.Context, rules routing.EdgeRules) (ok bool, err error) {
+	const method = "AddEdgeRules"
+	err = c.call(ctx, method, rules, &ok)
 	return ok, err
 }
 
 // AddIntermediaryRules adds intermediary rules to router.
-func (c *Client) AddIntermediaryRules(ctx context.Context, rules []routing.Rule) (bool, error) {
-	var ok bool
-	err := c.call(ctx, rpcName+".AddIntermediaryRules", rules, &ok)
-
+func (c *Client) AddIntermediaryRules(ctx context.Context, rules []routing.Rule) (ok bool, err error) {
+	const method = "AddIntermediaryRules"
+	err = c.call(ctx, method, rules, &ok)
 	return ok, err
 }
 
 // ReserveIDs reserves n IDs and returns them.
-func (c *Client) ReserveIDs(ctx context.Context, n uint8) ([]routing.RouteID, error) {
-	var routeIDs []routing.RouteID
-	err := c.call(ctx, rpcName+".ReserveIDs", n, &routeIDs)
-
-	return routeIDs, err
+func (c *Client) ReserveIDs(ctx context.Context, n uint8) (rtIDs []routing.RouteID, err error) {
+	const method = "ReserveIDs"
+	err = c.call(ctx, method, n, &rtIDs)
+	return rtIDs, err
 }
 
-func (c *Client) call(ctx context.Context, serviceMethod string, args interface{}, reply interface{}) error {
-	call := c.rpc.Go(serviceMethod, args, reply, nil)
-
+func (c *Client) call(ctx context.Context, method string, args interface{}, reply interface{}) error {
+	call := c.rpc.Go(RPCName+"."+method, args, reply, nil)
 	select {
 	case <-ctx.Done():
 		return ctx.Err()

pkg/router/routerclient/client_test.go

@@ -92,12 +92,8 @@ func prepRPCServerAndClient(t *testing.T, r router.Router) (s *rpc.Server, cl *C
 	l, err := nettest.NewLocalListener("tcp")
 	require.NoError(t, err)
 
-	gateway := router.NewRPCGateway(r)
-
 	s = rpc.NewServer()
-	err = s.Register(gateway)
-	require.NoError(t, err)
-
+	require.NoError(t, s.Register(router.NewRPCGateway(r)))
 	go s.Accept(l)
 
 	conn, err := net.Dial("tcp", l.Addr().String())