stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix for dcrd/dcrwallet/db errors

Browse Source
This commit is contained in:
jholdstock 2020-06-25 16:25:12 +01:00 committed by David Hill
parent 0e953dc225
commit 5e8ef4e7f2
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
background/background.go
View File

@ -74,7 +74,7 @@ func blockConnected() {
unconfirmed, err := db.GetUnconfirmedTickets() unconfirmed, err := db.GetUnconfirmedTickets()
if err != nil { if err != nil {
log.Errorf("%s: GetUnconfirmedTickets error: %v", funcName, err) log.Errorf("%s: db.GetUnconfirmedTickets error: %v", funcName, err)
} }
for _, ticket := range unconfirmed { for _, ticket := range unconfirmed {
@ -91,11 +91,11 @@ func blockConnected() {
err = db.DeleteTicket(ticket) err = db.DeleteTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: DeleteTicket error (ticketHash=%s): %v", log.Errorf("%s: db.DeleteTicket error (ticketHash=%s): %v",
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
} }
} else { } else {
log.Errorf("%s: GetRawTransaction for ticket failed (ticketHash=%s): %v", log.Errorf("%s: dcrd.GetRawTransaction for ticket failed (ticketHash=%s): %v",
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
} }
@ -106,7 +106,7 @@ func blockConnected() {
ticket.Confirmed = true ticket.Confirmed = true
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err)
continue continue
} }
@ -118,13 +118,13 @@ func blockConnected() {
pending, err := db.GetPendingFees() pending, err := db.GetPendingFees()
if err != nil { if err != nil {
log.Errorf("%s: GetPendingFees error: %v", funcName, err) log.Errorf("%s: db.GetPendingFees error: %v", funcName, err)
} }
for _, ticket := range pending { for _, ticket := range pending {
err = dcrdClient.SendRawTransaction(ticket.FeeTxHex) err = dcrdClient.SendRawTransaction(ticket.FeeTxHex)
if err != nil { if err != nil {
log.Errorf("%s: SendRawTransaction for fee tx failed (ticketHash=%s): %v", log.Errorf("%s: dcrd.SendRawTransaction for fee tx failed (ticketHash=%s): %v",
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
ticket.FeeTxStatus = database.FeeError ticket.FeeTxStatus = database.FeeError
} else { } else {
@ -135,7 +135,7 @@ func blockConnected() {
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err)
} }
} }
@ -143,7 +143,7 @@ func blockConnected() {
unconfirmedFees, err := db.GetUnconfirmedFees() unconfirmedFees, err := db.GetUnconfirmedFees()
if err != nil { if err != nil {
log.Errorf("%s: GetUnconfirmedFees error: %v", funcName, err) log.Errorf("%s: db.GetUnconfirmedFees error: %v", funcName, err)
// If this fails, there is nothing more we can do. Return. // If this fails, there is nothing more we can do. Return.
return return
} }
@ -167,7 +167,7 @@ func blockConnected() {
for _, ticket := range unconfirmedFees { for _, ticket := range unconfirmedFees {
feeTx, err := dcrdClient.GetRawTransaction(ticket.FeeTxHash) feeTx, err := dcrdClient.GetRawTransaction(ticket.FeeTxHash)
if err != nil { if err != nil {
log.Errorf("%s: GetRawTransaction for fee tx failed (feeTxHash=%s, ticketHash=%s): %v", log.Errorf("%s: dcrd.GetRawTransaction for fee tx failed (feeTxHash=%s, ticketHash=%s): %v",
funcName, ticket.FeeTxHash, ticket.Hash, err) funcName, ticket.FeeTxHash, ticket.Hash, err)
continue continue
} }
@ -178,7 +178,7 @@ func blockConnected() {
ticket.FeeTxStatus = database.FeeConfirmed ticket.FeeTxStatus = database.FeeConfirmed
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err)
return return
} }
log.Debugf("%s: Fee tx confirmed (ticketHash=%s)", funcName, ticket.Hash) log.Debugf("%s: Fee tx confirmed (ticketHash=%s)", funcName, ticket.Hash)
@ -187,21 +187,21 @@ func blockConnected() {
rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash) rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash)
if err != nil { if err != nil {
log.Errorf("%s: GetRawTransaction for ticket failed (ticketHash=%s): %v", log.Errorf("%s: dcrd.GetRawTransaction for ticket failed (ticketHash=%s): %v",
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
continue continue
} }
for _, walletClient := range walletClients { for _, walletClient := range walletClients {
err = walletClient.ImportPrivKey(ticket.VotingWIF) err = walletClient.ImportPrivKey(ticket.VotingWIF)
if err != nil { if err != nil {
log.Errorf("%s: ImportPrivKey error on dcrwallet (wallet=%s, ticketHash=%s): %v", log.Errorf("%s: dcrwallet.ImportPrivKey error (wallet=%s, ticketHash=%s): %v",
funcName, walletClient.String(), ticket.Hash, err) funcName, walletClient.String(), ticket.Hash, err)
continue continue
} }
err = walletClient.AddTransaction(rawTicket.BlockHash, rawTicket.Hex) err = walletClient.AddTransaction(rawTicket.BlockHash, rawTicket.Hex)
if err != nil { if err != nil {
log.Errorf("%s: AddTransaction error on dcrwallet (wallet=%s, ticketHash=%s): %v", log.Errorf("%s: dcrwallet.AddTransaction error (wallet=%s, ticketHash=%s): %v",
funcName, walletClient.String(), ticket.Hash, err) funcName, walletClient.String(), ticket.Hash, err)
continue continue
} }
@ -210,7 +210,7 @@ func blockConnected() {
for agenda, choice := range ticket.VoteChoices { for agenda, choice := range ticket.VoteChoices {
err = walletClient.SetVoteChoice(agenda, choice, ticket.Hash) err = walletClient.SetVoteChoice(agenda, choice, ticket.Hash)
if err != nil { if err != nil {
log.Errorf("%s: SetVoteChoice error on dcrwallet (wallet=%s, ticketHash=%s): %v", log.Errorf("%s: dcrwallet.SetVoteChoice error (wallet=%s, ticketHash=%s): %v",
funcName, walletClient.String(), ticket.Hash, err) funcName, walletClient.String(), ticket.Hash, err)
continue continue
} }

2
webapi/admin.go
View File

@ -21,7 +21,7 @@ func ticketSearch(c *gin.Context) {
ticket, found, err := db.GetTicketByHash(hash) ticket, found, err := db.GetTicketByHash(hash)
if err != nil { if err != nil {
log.Errorf("GetTicketByHash error: %v", err) log.Errorf("db.GetTicketByHash error: %v", err)
c.String(http.StatusInternalServerError, "Error getting ticket from db") c.String(http.StatusInternalServerError, "Error getting ticket from db")
return return
} }

8
webapi/getfeeaddress.go
View File

@ -95,7 +95,7 @@ func feeAddress(c *gin.Context) {
// Get ticket details. // Get ticket details.
rawTicket, err := dcrdClient.GetRawTransaction(ticketHash) rawTicket, err := dcrdClient.GetRawTransaction(ticketHash)
if err != nil { if err != nil {
log.Errorf("%s: GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, ticketHash, err) log.Errorf("%s: dcrd.GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, ticketHash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -103,7 +103,7 @@ func feeAddress(c *gin.Context) {
// Ensure this ticket is eligible to vote at some point in the future. // Ensure this ticket is eligible to vote at some point in the future.
canVote, err := dcrdClient.CanTicketVote(rawTicket, ticketHash, cfg.NetParams) canVote, err := dcrdClient.CanTicketVote(rawTicket, ticketHash, cfg.NetParams)
if err != nil { if err != nil {
log.Errorf("%s: canTicketVote error (ticketHash=%s): %v", funcName, ticketHash, err) log.Errorf("%s: dcrd.CanTicketVote error (ticketHash=%s): %v", funcName, ticketHash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -131,7 +131,7 @@ func feeAddress(c *gin.Context) {
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -182,7 +182,7 @@ func feeAddress(c *gin.Context) {
err = db.InsertNewTicket(dbTicket) err = db.InsertNewTicket(dbTicket)
if err != nil { if err != nil {
log.Errorf("%s: InsertNewTicket failed (ticketHash=%s): %v", funcName, ticketHash, err) log.Errorf("%s: db.InsertNewTicket failed (ticketHash=%s): %v", funcName, ticketHash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }

4
webapi/middleware.go
View File

@ -151,7 +151,7 @@ func vspAuth() gin.HandlerFunc {
// Check if this ticket already appears in the database. // Check if this ticket already appears in the database.
ticket, ticketFound, err := db.GetTicketByHash(hash) ticket, ticketFound, err := db.GetTicketByHash(hash)
if err != nil { if err != nil {
log.Errorf("%s: GetTicketByHash error (ticketHash=%s): %v", funcName, hash, err) log.Errorf("%s: db.GetTicketByHash error (ticketHash=%s): %v", funcName, hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -166,7 +166,7 @@ func vspAuth() gin.HandlerFunc {
resp, err := dcrdClient.GetRawTransaction(hash) resp, err := dcrdClient.GetRawTransaction(hash)
if err != nil { if err != nil {
log.Errorf("%s: GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, hash, err) log.Errorf("%s: dcrd.GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }

10
webapi/payfee.go
View File

@ -51,7 +51,7 @@ func payFee(c *gin.Context) {
// Get ticket details. // Get ticket details.
rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash) rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash)
if err != nil { if err != nil {
log.Errorf("%s: GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: dcrd.GetRawTransaction for ticket failed (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -59,7 +59,7 @@ func payFee(c *gin.Context) {
// Ensure this ticket is eligible to vote at some point in the future. // Ensure this ticket is eligible to vote at some point in the future.
canVote, err := dcrdClient.CanTicketVote(rawTicket, ticket.Hash, cfg.NetParams) canVote, err := dcrdClient.CanTicketVote(rawTicket, ticket.Hash, cfg.NetParams)
if err != nil { if err != nil {
log.Errorf("%s: canTicketVote error (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: dcrd.CanTicketVote error (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -214,14 +214,14 @@ findAddress:
if ticket.Confirmed { if ticket.Confirmed {
err = dcrdClient.SendRawTransaction(payFeeRequest.FeeTx) err = dcrdClient.SendRawTransaction(payFeeRequest.FeeTx)
if err != nil { if err != nil {
log.Errorf("%s: SendRawTransaction for fee tx failed (ticketHash=%s): %v", log.Errorf("%s: dcrd.SendRawTransaction for fee tx failed (ticketHash=%s): %v",
funcName, ticket.Hash, err) funcName, ticket.Hash, err)
ticket.FeeTxStatus = database.FeeError ticket.FeeTxStatus = database.FeeError
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err)
} }
sendErrorWithMsg("could not broadcast fee transaction", errInvalidFeeTx, c) sendErrorWithMsg("could not broadcast fee transaction", errInvalidFeeTx, c)
@ -232,7 +232,7 @@ findAddress:
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket failed (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }

4
webapi/setvotechoices.go
View File

@ -51,7 +51,7 @@ func setVoteChoices(c *gin.Context) {
ticket.VoteChoices = voteChoices ticket.VoteChoices = voteChoices
err = db.UpdateTicket(ticket) err = db.UpdateTicket(ticket)
if err != nil { if err != nil {
log.Errorf("%s: UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: db.UpdateTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c) sendError(errInternalError, c)
return return
} }
@ -65,7 +65,7 @@ func setVoteChoices(c *gin.Context) {
if err != nil { if err != nil {
// If this fails, we still want to try the other wallets, so // If this fails, we still want to try the other wallets, so
// don't return an error response, just log an error. // don't return an error response, just log an error.
log.Errorf("%s: SetVoteChoice failed (ticketHash=%s): %v", funcName, ticket.Hash, err) log.Errorf("%s: dcrwallet.SetVoteChoice failed (ticketHash=%s): %v", funcName, ticket.Hash, err)
} }
} }
} }

8
webapi/webapi.go
View File

@ -57,7 +57,7 @@ func Start(ctx context.Context, requestShutdownChan chan struct{}, shutdownWg *s
// Get keys for signing API responses from the database. // Get keys for signing API responses from the database.
signPrivKey, signPubKey, err = vdb.KeyPair() signPrivKey, signPubKey, err = vdb.KeyPair()
if err != nil { if err != nil {
return fmt.Errorf("Failed to get keypair: %v", err) return fmt.Errorf("db.Keypair error: %v", err)
} }
// Populate cached VSP stats before starting webserver. // Populate cached VSP stats before starting webserver.
@ -70,11 +70,11 @@ func Start(ctx context.Context, requestShutdownChan chan struct{}, shutdownWg *s
// use them to initialize the address generator. // use them to initialize the address generator.
idx, err := vdb.GetLastAddressIndex() idx, err := vdb.GetLastAddressIndex()
if err != nil { if err != nil {
return fmt.Errorf("GetLastAddressIndex error: %v", err) return fmt.Errorf("db.GetLastAddressIndex error: %v", err)
} }
feeXPub, err := vdb.GetFeeXPub() feeXPub, err := vdb.GetFeeXPub()
if err != nil { if err != nil {
return fmt.Errorf("GetFeeXPub error: %v", err) return fmt.Errorf("db.GetFeeXPub error: %v", err)
} }
addrGen, err = newAddressGenerator(feeXPub, config.NetParams, idx) addrGen, err = newAddressGenerator(feeXPub, config.NetParams, idx)
if err != nil { if err != nil {
@ -84,7 +84,7 @@ func Start(ctx context.Context, requestShutdownChan chan struct{}, shutdownWg *s
// Get the secret key used to initialize the cookie store. // Get the secret key used to initialize the cookie store.
cookieSecret, err := vdb.GetCookieSecret() cookieSecret, err := vdb.GetCookieSecret()
if err != nil { if err != nil {
return fmt.Errorf("GetCookieSecret error: %v", err) return fmt.Errorf("db.GetCookieSecret error: %v", err)
} }
// Create TCP listener. // Create TCP listener.