Finish RPC gateway tests

pkg/app2/manager.go → pkg/app2/id_manager.go

@@ -97,5 +97,8 @@ func (m *idManager) get(key uint16) (interface{}, bool) {
 	m.mx.RLock()
 	lis, ok := m.values[key]
 	m.mx.RUnlock()
+	if lis == nil {
+		return nil, false
+	}
 	return lis, ok
 }

pkg/app2/network/dmsg_conn.go

@@ -13,6 +13,10 @@ type DMSGConn struct {
 	tp *dmsg.Transport
 }
 
+func NewDMSGConn(tp *dmsg.Transport) *DMSGConn {
+	return &DMSGConn{tp: tp}
+}
+
 func (c *DMSGConn) Read(b []byte) (n int, err error) {
 	return c.tp.Read(b)
 }

pkg/app2/network/dmsg_networker.go

@@ -31,7 +31,7 @@ func (n *DMSGNetworker) DialContext(ctx context.Context, addr Addr) (net.Conn, e
 		return nil, err
 	}
 
-	return &DMSGConn{tp: tp}, nil
+	return NewDMSGConn(tp), nil
 }
 
 // Listen starts listening on local `addr` in the dmsg network.

pkg/app2/rpc_gateway.go

@@ -112,10 +112,8 @@ func (r *RPCGateway) Accept(lisID *uint16, resp *AcceptResp) error {
 		return errors.New("wrong type for remote addr")
 	}
 
-	resp = &AcceptResp{
-		Remote: remote,
-		ConnID: *connID,
-	}
+	resp.Remote = remote
+	resp.ConnID = *connID
 
 	return nil
 }
@@ -197,7 +195,7 @@ func (r *RPCGateway) CloseListener(lisID *uint16, _ *struct{}) error {
 func (r *RPCGateway) popListener(lisID uint16) (net.Listener, error) {
 	lisIfc, err := r.lm.pop(lisID)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "no listener")
 	}
 
 	return r.assertListener(lisIfc)
@@ -208,7 +206,7 @@ func (r *RPCGateway) popListener(lisID uint16) (net.Listener, error) {
 func (r *RPCGateway) popConn(connID uint16) (net.Conn, error) {
 	connIfc, err := r.cm.pop(connID)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "no conn")
 	}
 
 	return r.assertConn(connIfc)