From f7676c34894bf86974f03482a33d83ee505e062f Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Tue, 2 Apr 2019 09:31:01 +0200 Subject: [PATCH] loop: show correct swap type --- cmd/loop/loopin.go | 3 ++- cmd/loop/loopout.go | 3 ++- cmd/loop/main.go | 6 +++--- interface.go | 11 +++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/cmd/loop/loopin.go b/cmd/loop/loopin.go index c754d53..cc56cf6 100644 --- a/cmd/loop/loopin.go +++ b/cmd/loop/loopin.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/btcsuite/btcutil" + "github.com/lightninglabs/loop" "github.com/lightninglabs/loop/looprpc" "github.com/urfave/cli" ) @@ -67,7 +68,7 @@ func loopIn(ctx *cli.Context) error { limits := getInLimits(amt, quote) - if err := displayLimits(amt, limits); err != nil { + if err := displayLimits(loop.TypeIn, amt, limits); err != nil { return err } diff --git a/cmd/loop/loopout.go b/cmd/loop/loopout.go index 4b13794..38e54e1 100644 --- a/cmd/loop/loopout.go +++ b/cmd/loop/loopout.go @@ -4,6 +4,7 @@ import ( "context" "fmt" + "github.com/lightninglabs/loop" "github.com/lightninglabs/loop/looprpc" "github.com/urfave/cli" ) @@ -84,7 +85,7 @@ func loopOut(ctx *cli.Context) error { limits := getLimits(amt, quote) - if err := displayLimits(amt, limits); err != nil { + if err := displayLimits(loop.TypeOut, amt, limits); err != nil { return err } diff --git a/cmd/loop/main.go b/cmd/loop/main.go index cd7bcf3..2027394 100644 --- a/cmd/loop/main.go +++ b/cmd/loop/main.go @@ -116,7 +116,7 @@ func getLimits(amt btcutil.Amount, quote *looprpc.QuoteResponse) *limits { } } -func displayLimits(amt btcutil.Amount, l *limits) error { +func displayLimits(swapType loop.Type, amt btcutil.Amount, l *limits) error { totalSuccessMax := l.maxMinerFee + l.maxSwapFee if l.maxSwapRoutingFee != nil { totalSuccessMax += *l.maxSwapRoutingFee @@ -125,8 +125,8 @@ func displayLimits(amt btcutil.Amount, l *limits) error { totalSuccessMax += *l.maxPrepayRoutingFee } - fmt.Printf("Max swap fees for %d loop out: %d\n", - btcutil.Amount(amt), totalSuccessMax, + fmt.Printf("Max swap fees for %d Loop %v: %d\n", + btcutil.Amount(amt), swapType, totalSuccessMax, ) fmt.Printf("CONTINUE SWAP? (y/n), expand fee detail (x): ") diff --git a/interface.go b/interface.go index ee0bb7a..4c2ae45 100644 --- a/interface.go +++ b/interface.go @@ -267,6 +267,17 @@ const ( TypeOut ) +func (t Type) String() string { + switch t { + case TypeIn: + return "In" + case TypeOut: + return "Out" + default: + return "Unknown" + } +} + // SwapInfo exposes common info fields for loop in and loop out swaps. type SwapInfo struct { LastUpdate time.Time