Skip to content

Commit c76f402

Browse files
committed
Fixup and add more spend tests
1 parent c793790 commit c76f402

File tree

3 files changed

+184
-76
lines changed

3 files changed

+184
-76
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,4 @@ src/mesh/TODO
109109

110110
*.iml
111111
*.test
112+
coverage.html

src/gui/wallet.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type Gatewayer interface {
2727
type SpendResult struct {
2828
Balance *wallet.BalancePair `json:"balance,omitempty"`
2929
Transaction *visor.ReadableTransaction `json:"txn,omitempty"`
30-
Error error `json:"error,omitempty"`
30+
Error string `json:"error,omitempty"`
3131
}
3232

3333
// Returns the wallet's balance, both confirmed and predicted. The predicted
@@ -121,7 +121,7 @@ func walletSpendHandler(gateway Gatewayer) http.HandlerFunc {
121121
if err != nil {
122122
logger.Error(err.Error())
123123
wh.SendOr404(w, SpendResult{
124-
Error: err,
124+
Error: err.Error(),
125125
})
126126
return
127127
}
@@ -132,9 +132,9 @@ func walletSpendHandler(gateway Gatewayer) http.HandlerFunc {
132132

133133
ret.Transaction, err = visor.NewReadableTransaction(&visor.Transaction{Txn: *tx})
134134
if err != nil {
135-
err = fmt.Errorf("Creation of new readable transaction failed: %s", err)
135+
err = fmt.Errorf("Creation of new readable transaction failed: %v", err)
136136
logger.Error(err.Error())
137-
ret.Error = err
137+
ret.Error = err.Error()
138138
wh.SendOr404(w, ret)
139139
return
140140
}
@@ -144,7 +144,7 @@ func walletSpendHandler(gateway Gatewayer) http.HandlerFunc {
144144
if err != nil {
145145
err = fmt.Errorf("Get wallet balance failed: %v", err)
146146
logger.Error(err.Error())
147-
ret.Error = err
147+
ret.Error = err.Error()
148148
wh.SendOr404(w, ret)
149149
return
150150
}
@@ -430,7 +430,7 @@ func RegisterWalletHandlers(mux *http.ServeMux, gateway *daemon.Gateway) {
430430
// fee: Number of hours to use as fee, on top of the default fee.
431431
// Returns total amount spent if successful, otherwise error describing
432432
// failure status.
433-
mux.HandleFunc("/wallet/spend", WalletSpendHandler(gateway))
433+
mux.HandleFunc("/wallet/spend", walletSpendHandler(gateway))
434434

435435
// GET Arguments:
436436
// id: Wallet ID

0 commit comments

Comments
 (0)