vspd: Americanize "cancelled".
Consistent with the go stdlib (e.g. context.Canceled).
This commit is contained in:
parent
8038a0ea46
commit
17fe1d7db1
@ -120,7 +120,7 @@ func (v *vspd) findSpentTickets(ctx context.Context, toCheck database.TicketList
|
|||||||
spent := make([]spentTicket, 0)
|
spent := make([]spentTicket, 0)
|
||||||
|
|
||||||
for iHeight := startHeight; iHeight <= endHeight; iHeight++ {
|
for iHeight := startHeight; iHeight <= endHeight; iHeight++ {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return nil, 0, context.Canceled
|
return nil, 0, context.Canceled
|
||||||
}
|
}
|
||||||
|
|||||||
@ -96,7 +96,7 @@ func (v *vspd) run() int {
|
|||||||
defer v.dcrd.Close()
|
defer v.dcrd.Close()
|
||||||
defer v.wallets.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.
|
// through an interrupt signal.
|
||||||
ctx := shutdownListener(v.log)
|
ctx := shutdownListener(v.log)
|
||||||
|
|
||||||
@ -350,7 +350,7 @@ func (v *vspd) blockConnected(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, ticket := range unconfirmed {
|
for _, ticket := range unconfirmed {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -409,7 +409,7 @@ func (v *vspd) blockConnected(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, ticket := range pending {
|
for _, ticket := range pending {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -450,7 +450,7 @@ func (v *vspd) blockConnected(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, ticket := range unconfirmedFees {
|
for _, ticket := range unconfirmedFees {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -580,7 +580,7 @@ func (v *vspd) blockConnected(ctx context.Context) {
|
|||||||
v.lastScannedBlock = endHeight
|
v.lastScannedBlock = endHeight
|
||||||
|
|
||||||
for _, spentTicket := range spent {
|
for _, spentTicket := range spent {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -650,7 +650,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) {
|
|||||||
|
|
||||||
// Iterate over each wallet and add any missing tickets.
|
// Iterate over each wallet and add any missing tickets.
|
||||||
for _, walletClient := range walletClients {
|
for _, walletClient := range walletClients {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -713,7 +713,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) {
|
|||||||
// all wallets.
|
// all wallets.
|
||||||
|
|
||||||
for _, walletClient := range walletClients {
|
for _, walletClient := range walletClients {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -727,7 +727,7 @@ func (v *vspd) checkWalletConsistency(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, dbTicket := range votableTickets {
|
for _, dbTicket := range votableTickets {
|
||||||
// Exit early if context has been cancelled.
|
// Exit early if context has been canceled.
|
||||||
if ctx.Err() != nil {
|
if ctx.Err() != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user