staticaddr: remove hardcoded states

Author: sputn1ck

cmd/loop/staticaddr.go

@@ -287,48 +287,9 @@ func listDeposits(ctx *cli.Context) error {
 	}
 	defer cleanup()
 
-	var filterState looprpc.DepositState
-	switch ctx.String("filter") {
-	case "":
-		// If no filter is specified, we'll default to showing all.
-
-	case "deposited":
-		filterState = looprpc.DepositState_DEPOSITED
-
-	case "withdrawing":
-		filterState = looprpc.DepositState_WITHDRAWING
-
-	case "withdrawn":
-		filterState = looprpc.DepositState_WITHDRAWN
-
-	case "looping_in":
-		filterState = looprpc.DepositState_LOOPING_IN
-
-	case "looped_in":
-		filterState = looprpc.DepositState_LOOPED_IN
-
-	case "publish_expired_deposit":
-		filterState = looprpc.DepositState_PUBLISH_EXPIRED
-
-	case "sweep_htlc_timeout":
-		filterState = looprpc.DepositState_SWEEP_HTLC_TIMEOUT
-
-	case "htlc_timeout_swept":
-		filterState = looprpc.DepositState_HTLC_TIMEOUT_SWEPT
-
-	case "wait_for_expiry_sweep":
-		filterState = looprpc.DepositState_WAIT_FOR_EXPIRY_SWEEP
-
-	case "expired":
-		filterState = looprpc.DepositState_EXPIRED
-
-	default:
-		filterState = looprpc.DepositState_UNKNOWN_STATE
-	}
-
 	resp, err := client.ListStaticAddressDeposits(
 		ctxb, &looprpc.ListStaticAddressDepositsRequest{
-			StateFilter: filterState,
+			StateFilter: ctx.String("filter"),
 		},
 	)
 	if err != nil {
@@ -474,7 +435,7 @@ func staticAddressLoopIn(ctx *cli.Context) error {
 	// Get the amount we need to quote for.
 	depositList, err := client.ListStaticAddressDeposits(
 		ctxb, &looprpc.ListStaticAddressDepositsRequest{
-			StateFilter: looprpc.DepositState_DEPOSITED,
+			StateFilter: string(deposit.Deposited),
 		},
 	)
 	if err != nil {

loopd/swapclient_server.go

@@ -1467,7 +1467,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 	*looprpc.ListStaticAddressDepositsResponse, error) {
 
 	outpoints := req.Outpoints
-	if req.StateFilter != looprpc.DepositState_UNKNOWN_STATE &&
+	if req.StateFilter != "" &&
 		len(outpoints) > 0 {
 
 		return nil, fmt.Errorf("can either filter by state or " +
@@ -1498,13 +1498,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 		}
 	} else {
 		f := func(d *deposit.Deposit) bool {
-			if req.StateFilter == looprpc.DepositState_UNKNOWN_STATE {
-				// Per default, we return deposits in all
-				// states.
-				return true
-			}
-
-			return d.IsInState(toServerState(req.StateFilter))
+			return d.IsInState(fsm.StateType(req.StateFilter))
 		}
 		filteredDeposits = filter(allDeposits, f)
 	}
@@ -1558,11 +1552,9 @@ func (s *swapClientServer) ListStaticAddressSwaps(ctx context.Context,
 				"%v", err)
 		}
 		swap := &looprpc.StaticAddressLoopInSwap{
-			SwapHash:         swp.SwapHash[:],
-			DepositOutpoints: swp.DepositOutpoints,
-			State: toClientStaticAddressLoopInState(
-				swp.GetState(),
-			),
+			SwapHash:           swp.SwapHash[:],
+			DepositOutpoints:   swp.DepositOutpoints,
+			State:              string(swp.GetState()),
 			SwapAmountSatoshis: int64(swp.TotalDepositAmount()),
 			PaymentRequestAmountSatoshis: int64(
 				swapPayReq.MilliSat.ToSatoshis(),
@@ -1719,10 +1711,9 @@ func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
 		hash := d.Hash
 		outpoint := wire.NewOutPoint(&hash, d.Index).String()
 		deposit := &looprpc.Deposit{
-			Id: d.ID[:],
-			State: toClientDepositState(
-				d.GetState(),
-			),
+			Id:    d.ID[:],
+			State: string(d.GetState()),
+
 			Outpoint:           outpoint,
 			Value:              int64(d.Value),
 			ConfirmationHeight: d.ConfirmationHeight,
@@ -1734,125 +1725,6 @@ func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
 	return clientDeposits
 }
 
-func toClientDepositState(state fsm.StateType) looprpc.DepositState {
-	switch state {
-	case deposit.Deposited:
-		return looprpc.DepositState_DEPOSITED
-
-	case deposit.Withdrawing:
-		return looprpc.DepositState_WITHDRAWING
-
-	case deposit.Withdrawn:
-		return looprpc.DepositState_WITHDRAWN
-
-	case deposit.PublishExpirySweep:
-		return looprpc.DepositState_PUBLISH_EXPIRED
-
-	case deposit.LoopingIn:
-		return looprpc.DepositState_LOOPING_IN
-
-	case deposit.LoopedIn:
-		return looprpc.DepositState_LOOPED_IN
-
-	case deposit.SweepHtlcTimeout:
-		return looprpc.DepositState_SWEEP_HTLC_TIMEOUT
-
-	case deposit.HtlcTimeoutSwept:
-		return looprpc.DepositState_HTLC_TIMEOUT_SWEPT
-
-	case deposit.WaitForExpirySweep:
-		return looprpc.DepositState_WAIT_FOR_EXPIRY_SWEEP
-
-	case deposit.Expired:
-		return looprpc.DepositState_EXPIRED
-
-	default:
-		return looprpc.DepositState_UNKNOWN_STATE
-	}
-}
-
-func toClientStaticAddressLoopInState(
-	state fsm.StateType) looprpc.StaticAddressLoopInSwapState {
-
-	switch state {
-	case loopin.InitHtlcTx:
-		return looprpc.StaticAddressLoopInSwapState_INIT_HTLC
-
-	case loopin.SignHtlcTx:
-		return looprpc.StaticAddressLoopInSwapState_SIGN_HTLC_TX
-
-	case loopin.MonitorInvoiceAndHtlcTx:
-		return looprpc.StaticAddressLoopInSwapState_MONITOR_INVOICE_HTLC_TX
-
-	case loopin.PaymentReceived:
-		return looprpc.StaticAddressLoopInSwapState_PAYMENT_RECEIVED
-
-	case loopin.SweepHtlcTimeout:
-		return looprpc.StaticAddressLoopInSwapState_SWEEP_STATIC_ADDRESS_HTLC_TIMEOUT
-
-	case loopin.MonitorHtlcTimeoutSweep:
-		return looprpc.StaticAddressLoopInSwapState_MONITOR_HTLC_TIMEOUT_SWEEP
-
-	case loopin.HtlcTimeoutSwept:
-		return looprpc.StaticAddressLoopInSwapState_HTLC_STATIC_ADDRESS_TIMEOUT_SWEPT
-
-	case loopin.FetchSignPushSweeplessSweepTx:
-		return looprpc.StaticAddressLoopInSwapState_FETCH_SIGN_PUSH_SWEEPLESS_SWEEP_TX
-
-	case loopin.Succeeded:
-		return looprpc.StaticAddressLoopInSwapState_SUCCEEDED
-
-	case loopin.SucceededSweeplessSigFailed:
-		return looprpc.StaticAddressLoopInSwapState_SUCCEEDED_SWEEPLESS_SIG_FAILED
-
-	case loopin.UnlockDeposits:
-		return looprpc.StaticAddressLoopInSwapState_UNLOCK_DEPOSITS
-
-	case loopin.Failed:
-		return looprpc.StaticAddressLoopInSwapState_FAILED_STATIC_ADDRESS_SWAP
-
-	default:
-		return looprpc.StaticAddressLoopInSwapState_UNKNOWN_STATIC_ADDRESS_SWAP_STATE
-	}
-}
-
-func toServerState(state looprpc.DepositState) fsm.StateType {
-	switch state {
-	case looprpc.DepositState_DEPOSITED:
-		return deposit.Deposited
-
-	case looprpc.DepositState_WITHDRAWING:
-		return deposit.Withdrawing
-
-	case looprpc.DepositState_WITHDRAWN:
-		return deposit.Withdrawn
-
-	case looprpc.DepositState_PUBLISH_EXPIRED:
-		return deposit.PublishExpirySweep
-
-	case looprpc.DepositState_LOOPING_IN:
-		return deposit.LoopingIn
-
-	case looprpc.DepositState_LOOPED_IN:
-		return deposit.LoopedIn
-
-	case looprpc.DepositState_SWEEP_HTLC_TIMEOUT:
-		return deposit.SweepHtlcTimeout
-
-	case looprpc.DepositState_HTLC_TIMEOUT_SWEPT:
-		return deposit.HtlcTimeoutSwept
-
-	case looprpc.DepositState_WAIT_FOR_EXPIRY_SWEEP:
-		return deposit.WaitForExpirySweep
-
-	case looprpc.DepositState_EXPIRED:
-		return deposit.Expired
-
-	default:
-		return fsm.EmptyState
-	}
-}
-
 func toServerOutpoints(outpoints []*looprpc.OutPoint) ([]wire.OutPoint,
 	error) {