From 17fe1d7db13efa92923cc24b70c5d6ba95d252d1 Mon Sep 17 00:00:00 2001 From: jholdstock Date: Fri, 8 Sep 2023 12:01:49 +0100 Subject: [PATCH] vspd: Americanize "cancelled". Consistent with the go stdlib (e.g. context.Canceled). --- cmd/vspd/spentticket.go | 2 +- cmd/vspd/vspd.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/vspd/spentticket.go b/cmd/vspd/spentticket.go index 2e843bc..ddbfaab 100644 --- a/cmd/vspd/spentticket.go +++ b/cmd/vspd/spentticket.go @@ -120,7 +120,7 @@ func (v *vspd) findSpentTickets(ctx context.Context, toCheck database.TicketList spent := make([]spentTicket, 0) for iHeight := startHeight; iHeight <= endHeight; iHeight++ { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return nil, 0, context.Canceled } diff --git a/cmd/vspd/vspd.go b/cmd/vspd/vspd.go index f8b8528..9243b9c 100644 --- a/cmd/vspd/vspd.go +++ b/cmd/vspd/vspd.go @@ -96,7 +96,7 @@ func (v *vspd) run() int { defer v.dcrd.Close() defer v.wallets.Close() - // Create a context that is cancelled when a shutdown request is received + // Create a context that is canceled when a shutdown request is received // through an interrupt signal. ctx := shutdownListener(v.log) @@ -350,7 +350,7 @@ func (v *vspd) blockConnected(ctx context.Context) { } for _, ticket := range unconfirmed { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -409,7 +409,7 @@ func (v *vspd) blockConnected(ctx context.Context) { } for _, ticket := range pending { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -450,7 +450,7 @@ func (v *vspd) blockConnected(ctx context.Context) { } for _, ticket := range unconfirmedFees { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -580,7 +580,7 @@ func (v *vspd) blockConnected(ctx context.Context) { v.lastScannedBlock = endHeight for _, spentTicket := range spent { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -650,7 +650,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) { // Iterate over each wallet and add any missing tickets. for _, walletClient := range walletClients { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -713,7 +713,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) { // all wallets. for _, walletClient := range walletClients { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return } @@ -727,7 +727,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) { } for _, dbTicket := range votableTickets { - // Exit early if context has been cancelled. + // Exit early if context has been canceled. if ctx.Err() != nil { return }