From 711e21709f290084cfc73640f21a97d7d5531a8c Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Sat, 7 May 2022 18:38:50 +0300 Subject: [PATCH] rpc/notary: make this branch mergeable with master --- pkg/rpc/client/wsclient.go | 4 ++-- pkg/services/notary/notary.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rpc/client/wsclient.go b/pkg/rpc/client/wsclient.go index 9c4ff5272..3c9e8990a 100644 --- a/pkg/rpc/client/wsclient.go +++ b/pkg/rpc/client/wsclient.go @@ -117,9 +117,9 @@ func NewWS(ctx context.Context, endpoint string, opts Options) (*WSClient, error // unusable. func (c *WSClient) Close() { if c.closeCalled.CAS(false, true) { - // Closing shutdown channel send signal to wsWriter to break out of the + // Closing shutdown channel sends a signal to wsWriter to break out of the // loop. In doing so it does ws.Close() closing the network connection - // which in turn makes wsReader receieve err from ws,ReadJSON() and also + // which in turn makes wsReader receive an err from ws.ReadJSON() and also // break out of the loop closing c.done channel in its shutdown sequence. close(c.shutdown) } diff --git a/pkg/services/notary/notary.go b/pkg/services/notary/notary.go index f6537ac5b..70ebea093 100644 --- a/pkg/services/notary/notary.go +++ b/pkg/services/notary/notary.go @@ -218,7 +218,7 @@ func (n *Notary) OnNewRequest(payload *payload.P2PNotaryRequest) { r.minNotValidBefore = nvbFallback } } else { - // Avoid changes in main transaction witnesses got from notary request pool to + // Avoid changes in the main transaction witnesses got from the notary request pool to // keep the pooled tx valid. We will update its copy => the copy's size will be changed. cp := *payload.MainTransaction cp.Scripts = make([]transaction.Witness, len(payload.MainTransaction.Scripts)) @@ -234,7 +234,7 @@ func (n *Notary) OnNewRequest(payload *payload.P2PNotaryRequest) { if r.witnessInfo == nil && validationErr == nil { r.witnessInfo = newInfo } - // Allow modification of fallback transaction got from notary request pool. + // Allow modification of a fallback transaction got from the notary request pool. // It has dummy Notary witness attached => its size won't be changed. r.fallbacks = append(r.fallbacks, payload.FallbackTransaction) if exists && r.isMainCompleted() || validationErr != nil {