From 302abce2fc762e3b3b8415eecba9640d2cfa1bfb Mon Sep 17 00:00:00 2001
From: David Hill <dhill@mindcry.org>
Date: Tue, 19 May 2020 04:54:06 -0500
Subject: [PATCH] database: rename GetFeesByFeeAddress to GetTicketByFeeAddress
 (#30)

---
 database/database_test.go |  6 +++---
 database/ticket.go        |  3 +--
 webapi/methods.go         | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/database/database_test.go b/database/database_test.go
index 8a044e8..da5f290 100644
--- a/database/database_test.go
+++ b/database/database_test.go
@@ -113,7 +113,7 @@ func testGetFeesByFeeAddress(t *testing.T) {
 	}
 
 	// Retrieve ticket using its fee address.
-	retrieved, err := db.GetFeesByFeeAddress(ticket.FeeAddress)
+	retrieved, err := db.GetTicketByFeeAddress(ticket.FeeAddress)
 	if err != nil {
 		t.Fatalf("error retrieving ticket by fee address: %v", err)
 	}
@@ -124,7 +124,7 @@ func testGetFeesByFeeAddress(t *testing.T) {
 	}
 
 	// Error if non-existent ticket requested.
-	_, err = db.GetFeesByFeeAddress("Not a real fee address")
+	_, err = db.GetTicketByFeeAddress("Not a real fee address")
 	if err == nil {
 		t.Fatal("expected an error while retrieving a non-existent ticket")
 	}
@@ -137,7 +137,7 @@ func testGetFeesByFeeAddress(t *testing.T) {
 	}
 
 	// Error when more than one ticket matches
-	_, err = db.GetFeesByFeeAddress(ticket.FeeAddress)
+	_, err = db.GetTicketByFeeAddress(ticket.FeeAddress)
 	if err == nil {
 		t.Fatal("expected an error when multiple tickets are found")
 	}
diff --git a/database/ticket.go b/database/ticket.go
index 8441774..004c49f 100644
--- a/database/ticket.go
+++ b/database/ticket.go
@@ -95,7 +95,7 @@ func (vdb *VspDatabase) GetInactiveFeeAddresses() ([]string, error) {
 	return addrs, err
 }
 
-func (vdb *VspDatabase) GetFeesByFeeAddress(feeAddr string) (*Ticket, error) {
+func (vdb *VspDatabase) GetTicketByFeeAddress(feeAddr string) (*Ticket, error) {
 	var tickets []Ticket
 	err := vdb.db.View(func(tx *bolt.Tx) error {
 		ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
@@ -115,7 +115,6 @@ func (vdb *VspDatabase) GetFeesByFeeAddress(feeAddr string) (*Ticket, error) {
 
 		return nil
 	})
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/webapi/methods.go b/webapi/methods.go
index cecf4da..ca8a437 100644
--- a/webapi/methods.go
+++ b/webapi/methods.go
@@ -279,13 +279,13 @@ findAddress:
 		return
 	}
 
-	feeEntry, err := db.GetFeesByFeeAddress(feeAddr)
+	ticket, err := db.GetTicketByFeeAddress(feeAddr)
 	if err != nil {
 		fmt.Printf("GetFeeByAddress: %v", err)
 		c.AbortWithError(http.StatusInternalServerError, errors.New("database error"))
 		return
 	}
-	voteAddr, err := dcrutil.DecodeAddress(feeEntry.CommitmentAddress, cfg.NetParams)
+	voteAddr, err := dcrutil.DecodeAddress(ticket.CommitmentAddress, cfg.NetParams)
 	if err != nil {
 		fmt.Printf("PayFee: DecodeAddress: %v", err)
 		c.AbortWithError(http.StatusInternalServerError, errors.New("database error"))
@@ -301,7 +301,7 @@ findAddress:
 
 	// TODO: DB - validate votingkey against ticket submission address
 
-	sDiff := dcrutil.Amount(feeEntry.SDiff)
+	sDiff := dcrutil.Amount(ticket.SDiff)
 
 	// TODO - RPC - get relayfee from wallet
 	relayFee, err := dcrutil.NewAmount(0.0001)
@@ -311,7 +311,7 @@ findAddress:
 		return
 	}
 
-	minFee := txrules.StakePoolTicketFee(sDiff, relayFee, int32(feeEntry.BlockHeight), cfg.VSPFee, cfg.NetParams)
+	minFee := txrules.StakePoolTicketFee(sDiff, relayFee, int32(ticket.BlockHeight), cfg.VSPFee, cfg.NetParams)
 	if feeAmount < minFee {
 		fmt.Printf("too cheap: %v %v", feeAmount, minFee)
 		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("dont get cheap on me, dodgson (sent:%v required:%v)", feeAmount, minFee))
@@ -319,7 +319,7 @@ findAddress:
 	}
 
 	// Get vote tx to give to wallet
-	ticketHash, err := chainhash.NewHashFromStr(feeEntry.Hash)
+	ticketHash, err := chainhash.NewHashFromStr(ticket.Hash)
 	if err != nil {
 		fmt.Printf("PayFee: NewHashFromStr: %v", err)
 		c.AbortWithError(http.StatusInternalServerError, errors.New("internal error"))