From 478522aaec0a47b6aeebbc5b01d56137f2b53745 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Wed, 23 Oct 2019 13:54:09 +0800 Subject: [PATCH] fix typos in log messages --- vendor/github.com/SkycoinProject/dmsg/client.go | 16 ++++++++-------- vendor/github.com/SkycoinProject/dmsg/server.go | 12 ++++++------ vendor/modules.txt | 16 ++++------------ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/vendor/github.com/SkycoinProject/dmsg/client.go b/vendor/github.com/SkycoinProject/dmsg/client.go index d945aad9c..e58800791 100644 --- a/vendor/github.com/SkycoinProject/dmsg/client.go +++ b/vendor/github.com/SkycoinProject/dmsg/client.go @@ -133,7 +133,7 @@ func (c *Client) connCount() int { return n } -// InitiateServerConnections initiates connections with dms_servers. +// InitiateServerConnections initiates connections with dmsg_servers. func (c *Client) InitiateServerConnections(ctx context.Context, min int) error { if min == 0 { return nil @@ -142,7 +142,7 @@ func (c *Client) InitiateServerConnections(ctx context.Context, min int) error { if err != nil { return err } - c.log.Info("found dms_server entries:", entries) + c.log.Info("found dmsg_server entries:", entries) if err := c.findOrConnectToServers(ctx, entries, min); err != nil { return err } @@ -155,10 +155,10 @@ func (c *Client) findServerEntries(ctx context.Context) ([]*disc.Entry, error) { if err != nil || len(entries) == 0 { select { case <-ctx.Done(): - return nil, fmt.Errorf("dms_servers are not available: %s", err) + return nil, fmt.Errorf("dmsg_servers are not available: %s", err) default: retry := time.Second - c.log.WithError(err).Warnf("no dms_servers found: trying again in %v...", retry) + c.log.WithError(err).Warnf("no dmsg_servers found: trying again in %v...", retry) time.Sleep(retry) continue } @@ -251,7 +251,7 @@ func (c *Client) Listen(port uint16) (*Listener, error) { return l, nil } -// Dial dials a transport to remote dms_client. +// Dial dials a transport to remote dmsg_client. func (c *Client) Dial(ctx context.Context, remote cipher.PubKey, port uint16) (*Transport, error) { entry, err := c.dc.Entry(ctx, remote) if err != nil { @@ -271,10 +271,10 @@ func (c *Client) Dial(ctx context.Context, remote cipher.PubKey, port uint16) (* } return conn.DialTransport(ctx, remote, port) } - return nil, errors.New("failed to find dms_servers for given client pk") + return nil, errors.New("failed to find dmsg_servers for given client pk") } -// Addr returns the local dms_client's public key. +// Addr returns the local dmsg_client's public key. func (c *Client) Addr() net.Addr { return Addr{ PK: c.pk, @@ -286,7 +286,7 @@ func (c *Client) Type() string { return Type } -// Close closes the dms_client and associated connections. +// Close closes the dmsg_client and associated connections. // TODO(evaninjin): proper error handling. func (c *Client) Close() error { if c == nil { diff --git a/vendor/github.com/SkycoinProject/dmsg/server.go b/vendor/github.com/SkycoinProject/dmsg/server.go index e2b72066c..cb50d9b87 100644 --- a/vendor/github.com/SkycoinProject/dmsg/server.go +++ b/vendor/github.com/SkycoinProject/dmsg/server.go @@ -49,7 +49,7 @@ type ServerConn struct { mx sync.RWMutex } -// NewServerConn creates a new connection from the perspective of a dms_server. +// NewServerConn creates a new connection from the perspective of a dmsg_server. func NewServerConn(log *logging.Logger, conn net.Conn, remoteClient cipher.PubKey) *ServerConn { return &ServerConn{ log: log, @@ -102,7 +102,7 @@ func (c *ServerConn) addNext(ctx context.Context, r *NextConn) (uint16, error) { return id, nil } -// PK returns the remote dms_client's public key. +// PK returns the remote dmsg_client's public key. func (c *ServerConn) PK() cipher.PubKey { return c.remoteClient } @@ -252,7 +252,7 @@ func (c *ServerConn) handleRequest(ctx context.Context, getLink getConnFunc, id return next, 0, true } -// Server represents a dms_server. +// Server represents a dmsg_server. type Server struct { log *logging.Logger @@ -271,7 +271,7 @@ type Server struct { doneOnce sync.Once } -// NewServer creates a new dms_server. +// NewServer creates a new dmsg_server. func NewServer(pk cipher.PubKey, sk cipher.SecKey, addr string, l net.Listener, dc disc.APIClient) (*Server, error) { if addr == "" { addr = l.Addr().String() @@ -282,7 +282,7 @@ func NewServer(pk cipher.PubKey, sk cipher.SecKey, addr string, l net.Listener, } return &Server{ - log: logging.MustGetLogger("dms_server"), + log: logging.MustGetLogger("dmsg_server"), pk: pk, sk: sk, addr: addr, @@ -345,7 +345,7 @@ func (s *Server) close() (closed bool, err error) { return closed, err } -// Close closes the dms_server. +// Close closes the dmsg_server. func (s *Server) Close() error { closed, err := s.close() if !closed { diff --git a/vendor/modules.txt b/vendor/modules.txt index f70a93efe..7196a494f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,6 +1,4 @@ - -# github.com/SkycoinProject/dmsg v0.0.0-20190918181704-b7cccca1451e - +# github.com/SkycoinProject/dmsg v0.0.0-20191015061558-709ec3a1f4f5 github.com/SkycoinProject/dmsg github.com/SkycoinProject/dmsg/cipher github.com/SkycoinProject/dmsg/disc @@ -87,9 +85,7 @@ github.com/stretchr/testify/assert github.com/stretchr/testify/require # go.etcd.io/bbolt v1.3.3 go.etcd.io/bbolt - -# golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad - +# golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 golang.org/x/crypto/blake2b golang.org/x/crypto/blake2s golang.org/x/crypto/chacha20poly1305 @@ -98,16 +94,12 @@ golang.org/x/crypto/internal/chacha20 golang.org/x/crypto/internal/subtle golang.org/x/crypto/poly1305 golang.org/x/crypto/ssh/terminal - -# golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 - +# golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582 golang.org/x/net/context golang.org/x/net/internal/socks golang.org/x/net/nettest golang.org/x/net/proxy - -# golang.org/x/sys v0.0.0-20190927073244-c990c680b611 - +# golang.org/x/sys v0.0.0-20191010194322-b09406accb47 golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows