Changes:

1. Merged with last mainnet commit
2. Resolved review with Ivan

pkg/manager/user.go

@@ -26,7 +26,7 @@ func init() {
 // User represents a user of the manager.
 type User struct {
 	Name   string
-	PwSalt []byte /*  */
+	PwSalt []byte
 	PwHash cipher.SHA256
 }
 

pkg/messaging/client.go

@@ -144,7 +144,6 @@ func (c *Client) Accept(ctx context.Context) (transport.Transport, error) {
 func (c *Client) Dial(ctx context.Context, remote cipher.PubKey) (transport.Transport, error) {
 	entry, err := c.dc.Entry(ctx, remote)
 	if err != nil {
-		fmt.Printf("Dial with remote = %v\n", remote)
 		return nil, fmt.Errorf("get entry failure: %s", err)
 	}
 

pkg/transport/handshake.go

@@ -37,8 +37,6 @@ func settlementInitiatorHandshake(public bool) settlementHandshake {
 			Public:   public,
 		}
 
-		// sEntry := &SignedEntry{Entry: entry, Signatures: [2]cipher.Sig{entry.Signature(tm.config.SecKey)}}
-
 		sEntry := NewSignedEntry(entry, tm.config.PubKey, tm.config.SecKey)
 		if err := validateSignedEntry(sEntry, tr, tm.config.PubKey); err != nil {
 

pkg/transport/manager_test.go

@@ -147,7 +147,6 @@ func TestTransportManagerReEstablishTransports(t *testing.T) {
 	m2, err = NewManager(c2, f2)
 	require.NoError(t, err)
 
-	// errCh2 := make(chan error)
 	go func() {
 		errCh <- m2.Serve(context.TODO()) // nolint
 	}()

pkg/transport/tcp_transport_test.go

@@ -55,8 +55,6 @@ func TestTCPFactory(t *testing.T) {
 	tr, err := f2.Dial(context.TODO(), pk1)
 	require.NoError(t, err)
 	assert.Equal(t, "tcp", tr.Type())
-	// assert.Equal(t, pk2, tr.Local())
-	// assert.Equal(t, pk1, tr.Remote())
 
 	buf := make([]byte, 3)
 	_, err = tr.Read(buf)