.

go/neo/master.go

@@ -150,8 +150,7 @@ func (m *Master) Run(ctx context.Context, l xnet.Listener) (err error) {
 	m.node.NodeTab.Update(m.node.MyInfo)
 
 	// wrap listener with link / identificaton hello checker
-	ll := neonet.NewLinkListener(l)
-	lli := xneo.NewListener(ll)
+	lli := xneo.NewListener(neonet.NewLinkListener(l))
 
 	// accept incoming connections and pass them to main driver
 	wg := sync.WaitGroup{}

go/neo/storage.go

@@ -96,8 +96,7 @@ func (stor *Storage) Run(ctx context.Context, l xnet.Listener) (err error) {
 	stor.node.MyInfo.Addr = naddr
 
 	// wrap listener with link / identificaton hello checker
-	ll := neonet.NewLinkListener(l)
-	lli := xneo.NewListener(ll)
+	lli := xneo.NewListener(neonet.NewLinkListener(l))
 
 	// start serving incoming connections
 	wg := sync.WaitGroup{}

go/neo/xneo/xneo.go

@@ -188,7 +188,7 @@ func (l *listener) Accept(ctx context.Context) (_ *neonet.Request, _ *proto.Requ
 	// identify peer
 	// the first conn must come with RequestIdentification packet
 	defer xerr.Context(&err, "identify")	// XXX -> task.ErrContext?
-	req, err := link.Recv1(/*ctx*/)
+	req, err := link.Recv1(/*XXX ctx*/)
 	if err != nil {
 		return nil, nil, err
 	}