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

database: rename GetFeesByFeeAddress to GetTicketByFeeAddress (#30)

Browse Source
This commit is contained in:
David Hill 2020-05-19 04:54:06 -05:00 committed by GitHub
parent c9fca9bb0e
commit 302abce2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
database/database_test.go
View File

@ -113,7 +113,7 @@ func testGetFeesByFeeAddress(t *testing.T) {
} }
// Retrieve ticket using its fee address. // Retrieve ticket using its fee address.
retrieved, err := db.GetFeesByFeeAddress(ticket.FeeAddress) retrieved, err := db.GetTicketByFeeAddress(ticket.FeeAddress)
if err != nil { if err != nil {
t.Fatalf("error retrieving ticket by fee address: %v", err) 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. // 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 { if err == nil {
t.Fatal("expected an error while retrieving a non-existent ticket") 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 // Error when more than one ticket matches
_, err = db.GetFeesByFeeAddress(ticket.FeeAddress) _, err = db.GetTicketByFeeAddress(ticket.FeeAddress)
if err == nil { if err == nil {
t.Fatal("expected an error when multiple tickets are found") t.Fatal("expected an error when multiple tickets are found")
} }

3
database/ticket.go
View File

@ -95,7 +95,7 @@ func (vdb *VspDatabase) GetInactiveFeeAddresses() ([]string, error) {
return addrs, err return addrs, err
} }
func (vdb *VspDatabase) GetFeesByFeeAddress(feeAddr string) (*Ticket, error) { func (vdb *VspDatabase) GetTicketByFeeAddress(feeAddr string) (*Ticket, error) {
var tickets []Ticket var tickets []Ticket
err := vdb.db.View(func(tx *bolt.Tx) error { err := vdb.db.View(func(tx *bolt.Tx) error {
ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK) ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
@ -115,7 +115,6 @@ func (vdb *VspDatabase) GetFeesByFeeAddress(feeAddr string) (*Ticket, error) {
return nil return nil
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }

10
webapi/methods.go
View File

@ -279,13 +279,13 @@ findAddress:
return return
} }
feeEntry, err := db.GetFeesByFeeAddress(feeAddr) ticket, err := db.GetTicketByFeeAddress(feeAddr)
if err != nil { if err != nil {
fmt.Printf("GetFeeByAddress: %v", err) fmt.Printf("GetFeeByAddress: %v", err)
c.AbortWithError(http.StatusInternalServerError, errors.New("database error")) c.AbortWithError(http.StatusInternalServerError, errors.New("database error"))
return return
} }
voteAddr, err := dcrutil.DecodeAddress(feeEntry.CommitmentAddress, cfg.NetParams) voteAddr, err := dcrutil.DecodeAddress(ticket.CommitmentAddress, cfg.NetParams)
if err != nil { if err != nil {
fmt.Printf("PayFee: DecodeAddress: %v", err) fmt.Printf("PayFee: DecodeAddress: %v", err)
c.AbortWithError(http.StatusInternalServerError, errors.New("database error")) c.AbortWithError(http.StatusInternalServerError, errors.New("database error"))
@ -301,7 +301,7 @@ findAddress:
// TODO: DB - validate votingkey against ticket submission address // TODO: DB - validate votingkey against ticket submission address
sDiff := dcrutil.Amount(feeEntry.SDiff) sDiff := dcrutil.Amount(ticket.SDiff)
// TODO - RPC - get relayfee from wallet // TODO - RPC - get relayfee from wallet
relayFee, err := dcrutil.NewAmount(0.0001) relayFee, err := dcrutil.NewAmount(0.0001)
@ -311,7 +311,7 @@ findAddress:
return 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 { if feeAmount < minFee {
fmt.Printf("too cheap: %v %v", 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)) 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 // Get vote tx to give to wallet
ticketHash, err := chainhash.NewHashFromStr(feeEntry.Hash) ticketHash, err := chainhash.NewHashFromStr(ticket.Hash)
if err != nil { if err != nil {
fmt.Printf("PayFee: NewHashFromStr: %v", err) fmt.Printf("PayFee: NewHashFromStr: %v", err)
c.AbortWithError(http.StatusInternalServerError, errors.New("internal error")) c.AbortWithError(http.StatusInternalServerError, errors.New("internal error"))