Merge pull request #710 from sputn1ck/instantout_ux

instantout: improve ux

cmd/loop/instantout.go

@@ -83,7 +83,10 @@ func instantOut(ctx *cli.Context) error {
 	fmt.Printf("Available reservations: \n\n")
 	for _, res := range confirmedReservations {
 		idx++
-		fmt.Printf("Reservation %v: %v \n", idx, res.Amount)
+		fmt.Printf("Reservation %v: shortid %x, amt %v, expiry "+
+			"height %v \n", idx, res.ReservationId[:3], res.Amount,
+			res.Expiry)
+
 		totalAmt += int64(res.Amount)
 	}
 

instantout/actions.go

@@ -107,7 +107,7 @@ func (f *FSM) InitInstantOutAction(eventCtx fsm.EventContext) fsm.EventType {
 		if int32(res.Expiry) < initCtx.cltvExpiry+htlcExpiryDelta {
 			return f.HandleError(fmt.Errorf("reservation %x has "+
 				"expiry %v which is less than the swap expiry %v",
-				resId, res.Expiry, initCtx.cltvExpiry))
+				resId, res.Expiry, initCtx.cltvExpiry+htlcExpiryDelta))
 		}
 	}