diff --git a/background/background.go b/background/background.go index 2d5e1f0..06ba769 100644 --- a/background/background.go +++ b/background/background.go @@ -74,7 +74,7 @@ func blockConnected() { unconfirmed, err := db.GetUnconfirmedTickets() if err != nil { - log.Errorf("%s: GetUnconfirmedTickets error: %v", funcName, err) + log.Errorf("%s: db.GetUnconfirmedTickets error: %v", funcName, err) } for _, ticket := range unconfirmed { @@ -91,11 +91,11 @@ func blockConnected() { err = db.DeleteTicket(ticket) if err != nil { - log.Errorf("%s: DeleteTicket error (ticketHash=%s): %v", + log.Errorf("%s: db.DeleteTicket error (ticketHash=%s): %v", funcName, ticket.Hash, err) } } 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) } @@ -106,7 +106,7 @@ func blockConnected() { ticket.Confirmed = true err = db.UpdateTicket(ticket) 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 } @@ -118,13 +118,13 @@ func blockConnected() { pending, err := db.GetPendingFees() if err != nil { - log.Errorf("%s: GetPendingFees error: %v", funcName, err) + log.Errorf("%s: db.GetPendingFees error: %v", funcName, err) } for _, ticket := range pending { err = dcrdClient.SendRawTransaction(ticket.FeeTxHex) 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) ticket.FeeTxStatus = database.FeeError } else { @@ -135,7 +135,7 @@ func blockConnected() { err = db.UpdateTicket(ticket) 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() 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. return } @@ -167,7 +167,7 @@ func blockConnected() { for _, ticket := range unconfirmedFees { feeTx, err := dcrdClient.GetRawTransaction(ticket.FeeTxHash) 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) continue } @@ -178,7 +178,7 @@ func blockConnected() { ticket.FeeTxStatus = database.FeeConfirmed err = db.UpdateTicket(ticket) 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 } log.Debugf("%s: Fee tx confirmed (ticketHash=%s)", funcName, ticket.Hash) @@ -187,21 +187,21 @@ func blockConnected() { rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash) 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) continue } for _, walletClient := range walletClients { err = walletClient.ImportPrivKey(ticket.VotingWIF) 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) continue } err = walletClient.AddTransaction(rawTicket.BlockHash, rawTicket.Hex) 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) continue } @@ -210,7 +210,7 @@ func blockConnected() { for agenda, choice := range ticket.VoteChoices { err = walletClient.SetVoteChoice(agenda, choice, ticket.Hash) 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) continue } diff --git a/webapi/admin.go b/webapi/admin.go index 9515332..073568c 100644 --- a/webapi/admin.go +++ b/webapi/admin.go @@ -21,7 +21,7 @@ func ticketSearch(c *gin.Context) { ticket, found, err := db.GetTicketByHash(hash) 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") return } diff --git a/webapi/getfeeaddress.go b/webapi/getfeeaddress.go index 6a4c676..b9a30dc 100644 --- a/webapi/getfeeaddress.go +++ b/webapi/getfeeaddress.go @@ -95,7 +95,7 @@ func feeAddress(c *gin.Context) { // Get ticket details. rawTicket, err := dcrdClient.GetRawTransaction(ticketHash) 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) return } @@ -103,7 +103,7 @@ func feeAddress(c *gin.Context) { // Ensure this ticket is eligible to vote at some point in the future. canVote, err := dcrdClient.CanTicketVote(rawTicket, ticketHash, cfg.NetParams) 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) return } @@ -131,7 +131,7 @@ func feeAddress(c *gin.Context) { err = db.UpdateTicket(ticket) 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) return } @@ -182,7 +182,7 @@ func feeAddress(c *gin.Context) { err = db.InsertNewTicket(dbTicket) 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) return } diff --git a/webapi/middleware.go b/webapi/middleware.go index e4dc4b6..616a1a9 100644 --- a/webapi/middleware.go +++ b/webapi/middleware.go @@ -151,7 +151,7 @@ func vspAuth() gin.HandlerFunc { // Check if this ticket already appears in the database. ticket, ticketFound, err := db.GetTicketByHash(hash) 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) return } @@ -166,7 +166,7 @@ func vspAuth() gin.HandlerFunc { resp, err := dcrdClient.GetRawTransaction(hash) 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) return } diff --git a/webapi/payfee.go b/webapi/payfee.go index 06cf69e..c5a3325 100644 --- a/webapi/payfee.go +++ b/webapi/payfee.go @@ -51,7 +51,7 @@ func payFee(c *gin.Context) { // Get ticket details. rawTicket, err := dcrdClient.GetRawTransaction(ticket.Hash) 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) return } @@ -59,7 +59,7 @@ func payFee(c *gin.Context) { // Ensure this ticket is eligible to vote at some point in the future. canVote, err := dcrdClient.CanTicketVote(rawTicket, ticket.Hash, cfg.NetParams) 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) return } @@ -214,14 +214,14 @@ findAddress: if ticket.Confirmed { err = dcrdClient.SendRawTransaction(payFeeRequest.FeeTx) 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) ticket.FeeTxStatus = database.FeeError err = db.UpdateTicket(ticket) 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) @@ -232,7 +232,7 @@ findAddress: err = db.UpdateTicket(ticket) 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) return } diff --git a/webapi/setvotechoices.go b/webapi/setvotechoices.go index 66ff243..8709141 100644 --- a/webapi/setvotechoices.go +++ b/webapi/setvotechoices.go @@ -51,7 +51,7 @@ func setVoteChoices(c *gin.Context) { ticket.VoteChoices = voteChoices err = db.UpdateTicket(ticket) 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) return } @@ -65,7 +65,7 @@ func setVoteChoices(c *gin.Context) { if err != nil { // If this fails, we still want to try the other wallets, so // 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) } } } diff --git a/webapi/webapi.go b/webapi/webapi.go index c264358..8e3d71a 100644 --- a/webapi/webapi.go +++ b/webapi/webapi.go @@ -57,7 +57,7 @@ func Start(ctx context.Context, requestShutdownChan chan struct{}, shutdownWg *s // Get keys for signing API responses from the database. signPrivKey, signPubKey, err = vdb.KeyPair() 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. @@ -70,11 +70,11 @@ func Start(ctx context.Context, requestShutdownChan chan struct{}, shutdownWg *s // use them to initialize the address generator. idx, err := vdb.GetLastAddressIndex() if err != nil { - return fmt.Errorf("GetLastAddressIndex error: %v", err) + return fmt.Errorf("db.GetLastAddressIndex error: %v", err) } feeXPub, err := vdb.GetFeeXPub() 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) 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. cookieSecret, err := vdb.GetCookieSecret() if err != nil { - return fmt.Errorf("GetCookieSecret error: %v", err) + return fmt.Errorf("db.GetCookieSecret error: %v", err) } // Create TCP listener.