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

Clean up duplicate database code and add tests.

Browse Source
This commit is contained in:
jholdstock 2020-06-11 10:48:00 +01:00 committed by David Hill
parent 78692fea88
commit a95b214b3f
3 changed files with 82 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/database_test.go
View File

@ -26,6 +26,7 @@ func TestDatabase(t *testing.T) {
"testGetTicketByHash": testGetTicketByHash,
"testUpdateTicket": testUpdateTicket,
"testTicketFeeExpired": testTicketFeeExpired,
"testFilterTickets": testFilterTickets,
"testAddressIndex": testAddressIndex,
}
@ -55,5 +56,4 @@ func TestDatabase(t *testing.T) {
}
}
// TODO: Add tests for CountTickets, GetUnconfirmedTickets, GetPendingFees,
// GetUnconfirmedFees, GetAllTickets.
// TODO: Add tests for CountTickets.

83
database/ticket.go
View File

@ -170,80 +170,39 @@ func (vdb *VspDatabase) CountTickets() (int, int, error) {
return total, feePaid, err
}
// GetUnconfirmedTickets returns tickets which are not yet confirmed.
func (vdb *VspDatabase) GetUnconfirmedTickets() ([]Ticket, error) {
var tickets []Ticket
err := vdb.db.View(func(tx *bolt.Tx) error {
ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
return ticketBkt.ForEach(func(k, v []byte) error {
var ticket Ticket
err := json.Unmarshal(v, &ticket)
if err != nil {
return fmt.Errorf("could not unmarshal ticket: %v", err)
}
if !ticket.Confirmed {
tickets = append(tickets, ticket)
}
return nil
return vdb.filterTickets(func(t Ticket) bool {
return !t.Confirmed
})
})
return tickets, err
}
// GetPendingFees returns tickets which are confirmed and have a fee tx which is
// not yet broadcast.
func (vdb *VspDatabase) GetPendingFees() ([]Ticket, error) {
var tickets []Ticket
err := vdb.db.View(func(tx *bolt.Tx) error {
ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
return ticketBkt.ForEach(func(k, v []byte) error {
var ticket Ticket
err := json.Unmarshal(v, &ticket)
if err != nil {
return fmt.Errorf("could not unmarshal ticket: %v", err)
}
// Add ticket if it is confirmed, and we have a fee tx which is not
// yet broadcast.
if ticket.Confirmed &&
ticket.FeeTxStatus == FeeReceieved {
tickets = append(tickets, ticket)
}
return nil
return vdb.filterTickets(func(t Ticket) bool {
return t.Confirmed && t.FeeTxStatus == FeeReceieved
})
})
return tickets, err
}
// GetUnconfirmedFees returns tickets with a fee tx that is broadcast but not
// confirmed yet.
func (vdb *VspDatabase) GetUnconfirmedFees() ([]Ticket, error) {
var tickets []Ticket
err := vdb.db.View(func(tx *bolt.Tx) error {
ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
return ticketBkt.ForEach(func(k, v []byte) error {
var ticket Ticket
err := json.Unmarshal(v, &ticket)
if err != nil {
return fmt.Errorf("could not unmarshal ticket: %v", err)
}
// Add ticket if fee tx is broadcast but not confirmed yet.
if ticket.FeeTxStatus == FeeBroadcast {
tickets = append(tickets, ticket)
}
return nil
return vdb.filterTickets(func(t Ticket) bool {
return t.FeeTxStatus == FeeBroadcast
})
})
return tickets, err
}
// GetAllTickets returns all tickets in the database.
func (vdb *VspDatabase) GetAllTickets() ([]Ticket, error) {
return vdb.filterTickets(func(t Ticket) bool {
return true
})
}
// filterTickets accepts a filter function and returns all tickets from the
// database which match the filter.
func (vdb *VspDatabase) filterTickets(filter func(Ticket) bool) ([]Ticket, error) {
var tickets []Ticket
err := vdb.db.View(func(tx *bolt.Tx) error {
ticketBkt := tx.Bucket(vspBktK).Bucket(ticketBktK)
@ -255,7 +214,9 @@ func (vdb *VspDatabase) GetAllTickets() ([]Ticket, error) {
return fmt.Errorf("could not unmarshal ticket: %v", err)
}
if filter(ticket) {
tickets = append(tickets, ticket)
}
return nil
})

55
database/ticket_test.go
View File

@ -153,3 +153,58 @@ func testTicketFeeExpired(t *testing.T) {
t.Fatal("expected ticket to be expired")
}
}
func testFilterTickets(t *testing.T) {
// Insert a ticket
ticket := exampleTicket()
err := db.InsertNewTicket(ticket)
if err != nil {
t.Fatalf("error storing ticket in database: %v", err)
}
// Insert another ticket
ticket.Hash = ticket.Hash + "1"
ticket.FeeAddress = ticket.FeeAddress + "1"
ticket.FeeAddressIndex = ticket.FeeAddressIndex + 1
ticket.Confirmed = !ticket.Confirmed
err = db.InsertNewTicket(ticket)
if err != nil {
t.Fatalf("error storing ticket in database: %v", err)
}
// Expect all tickets returned.
retrieved, err := db.filterTickets(func(t Ticket) bool {
return true
})
if err != nil {
t.Fatalf("error filtering tickets: %v", err)
}
if len(retrieved) != 2 {
t.Fatal("expected to find 2 tickets")
}
// Only one ticket should be confirmed.
retrieved, err = db.filterTickets(func(t Ticket) bool {
return t.Confirmed
})
if err != nil {
t.Fatalf("error filtering tickets: %v", err)
}
if len(retrieved) != 1 {
t.Fatal("expected to find 2 tickets")
}
if retrieved[0].Confirmed != true {
t.Fatal("expected retrieved ticket to be confirmed")
}
// Expect no tickets with confirmed fee.
retrieved, err = db.filterTickets(func(t Ticket) bool {
return t.FeeTxStatus == FeeConfirmed
})
if err != nil {
t.Fatalf("error filtering tickets: %v", err)
}
if len(retrieved) != 0 {
t.Fatal("expected to find 0 tickets")
}
}