Refactor wallet store

api/api.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"go.sia.tech/core/types"
+	"go.sia.tech/walletd/wallet"
 )
 
 // A GatewayPeer is a currently-connected peer.
@@ -30,12 +31,8 @@ type TxpoolTransactionsResponse struct {
 	V2Transactions []types.V2Transaction `json:"v2transactions"`
 }
 
-// WalletBalanceResponse is the response type for /wallets/:name/balance.
-type WalletBalanceResponse struct {
-	Siacoins         types.Currency `json:"siacoins"`
-	ImmatureSiacoins types.Currency `json:"immatureSiacoins"`
-	Siafunds         uint64         `json:"siafunds"`
-}
+// BalanceResponse is the response type for /wallets/:name/balance.
+type BalanceResponse wallet.Balance
 
 // WalletOutputsResponse is the response type for /wallets/:name/outputs.
 type WalletOutputsResponse struct {

api/api_test.go

@@ -71,6 +71,7 @@ func TestWallet(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer ws.Close()
+
 	wm, err := wallet.NewManager(cm, ws, log.Named("wallet"))
 	if err != nil {
 		t.Fatal(err)

api/client.go

@@ -139,7 +139,7 @@ func (c *WalletClient) Addresses() (resp map[types.Address]json.RawMessage, err
 }
 
 // Balance returns the current wallet balance.
-func (c *WalletClient) Balance() (resp WalletBalanceResponse, err error) {
+func (c *WalletClient) Balance() (resp BalanceResponse, err error) {
 	err = c.c.GET(fmt.Sprintf("/wallets/%v/balance", c.name), &resp)
 	return
 }

api/server.go

@@ -57,11 +57,11 @@ type (
 		Events(name string, offset, limit int) ([]wallet.Event, error)
 		UnspentSiacoinOutputs(name string) ([]types.SiacoinElement, error)
 		UnspentSiafundOutputs(name string) ([]types.SiafundElement, error)
-		WalletBalance(walletID string) (sc, immatureSC types.Currency, sf uint64, err error)
+		WalletBalance(walletID string) (wallet.Balance, error)
 		Annotate(name string, pool []types.Transaction) ([]wallet.PoolTransaction, error)
 
 		Reserve(ids []types.Hash256, duration time.Duration) error
-		AddressBalance(address types.Address) (sc types.Currency, sf uint64, err error)
+		AddressBalance(address types.Address) (wallet.Balance, error)
 	}
 )
 
@@ -245,15 +245,11 @@ func (s *server) walletsBalanceHandler(jc jape.Context) {
 		return
 	}
 
-	sc, isc, sf, err := s.wm.WalletBalance(name)
+	b, err := s.wm.WalletBalance(name)
 	if jc.Check("couldn't load balance", err) != nil {
 		return
 	}
-	jc.Encode(WalletBalanceResponse{
-		Siacoins:         sc,
-		ImmatureSiacoins: isc,
-		Siafunds:         sf,
-	})
+	jc.Encode(BalanceResponse(b))
 }
 
 func (s *server) walletsEventsHandler(jc jape.Context) {

cmd/walletd/testnet.go

@@ -324,7 +324,7 @@ func printTestnetEvents(c *api.Client, seed wallet.Seed) {
 	check("Couldn't get events:", err)
 	for i := range events {
 		e := events[len(events)-1-i]
-		switch t := e.Val.(type) {
+		switch t := e.Data.(type) {
 		case *wallet.EventTransaction:
 			if len(t.SiacoinInputs) == 0 || len(t.SiacoinOutputs) == 0 {
 				continue