From f2147c22bfca78d28ba780b7f46b719ce17236bc Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 7 Nov 2022 16:59:23 +0000 Subject: [PATCH 1/5] only print first N accounts on startup --- signer/core/cliui.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 6278e53c08a0..90eb6a541965 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -245,6 +245,9 @@ func (ui *CommandlineUI) OnApprovedTx(tx ethapi.SignTransactionResult) { func (ui *CommandlineUI) showAccounts() { accounts, err := ui.api.ListAccounts(context.Background()) + var limit int = 20 //max N accounts to print + var msg string = fmt.Sprintf("\nFirst %d accounts listed (%d more available).\n", limit, len(accounts)-limit) + var out = new(strings.Builder) if err != nil { log.Error("Error listing accounts", "err", err) return @@ -253,12 +256,15 @@ func (ui *CommandlineUI) showAccounts() { fmt.Print("No accounts found\n") return } - var out = new(strings.Builder) - fmt.Fprint(out, "\n------- Available accounts -------\n") - for i, account := range accounts { + if len(accounts) < limit { + limit = len(accounts) + msg = "" + } + for i, account := range accounts[0:limit] { fmt.Fprintf(out, "%d. %s at %s\n", i, account.Address, account.URL) } - fmt.Print(out.String()) + fmt.Fprint(out, "\n------- Available accounts -------\n") + fmt.Print(out.String(), msg) } func (ui *CommandlineUI) OnSignerStartup(info StartupInfo) { From e3870a1919450c4312d9c459224d5e14e8535a45 Mon Sep 17 00:00:00 2001 From: Joe Date: Mon, 7 Nov 2022 17:07:58 +0000 Subject: [PATCH 2/5] move title up --- signer/core/cliui.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 90eb6a541965..db72e7b9c4c7 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -260,10 +260,10 @@ func (ui *CommandlineUI) showAccounts() { limit = len(accounts) msg = "" } + fmt.Fprint(out, "\n------- Available accounts -------\n") for i, account := range accounts[0:limit] { fmt.Fprintf(out, "%d. %s at %s\n", i, account.Address, account.URL) } - fmt.Fprint(out, "\n------- Available accounts -------\n") fmt.Print(out.String(), msg) } From 55bf08a57c9d59d0a12c63e8b634b4366673f592 Mon Sep 17 00:00:00 2001 From: Joseph Cook <33655003+jmcook1186@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:13:11 +0000 Subject: [PATCH 3/5] Update signer/core/cliui.go Co-authored-by: Martin Holst Swende --- signer/core/cliui.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index db72e7b9c4c7..61f284331a6e 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -261,7 +261,7 @@ func (ui *CommandlineUI) showAccounts() { msg = "" } fmt.Fprint(out, "\n------- Available accounts -------\n") - for i, account := range accounts[0:limit] { + for i, account := range accounts[:limit] { fmt.Fprintf(out, "%d. %s at %s\n", i, account.Address, account.URL) } fmt.Print(out.String(), msg) From a406104b311026fccfa312e890a81af7bb130f82 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 8 Nov 2022 09:11:29 +0000 Subject: [PATCH 4/5] make empty string the default case --- signer/core/cliui.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 61f284331a6e..97a8b15931e9 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -245,8 +245,7 @@ func (ui *CommandlineUI) OnApprovedTx(tx ethapi.SignTransactionResult) { func (ui *CommandlineUI) showAccounts() { accounts, err := ui.api.ListAccounts(context.Background()) - var limit int = 20 //max N accounts to print - var msg string = fmt.Sprintf("\nFirst %d accounts listed (%d more available).\n", limit, len(accounts)-limit) + var msg string = "" var out = new(strings.Builder) if err != nil { log.Error("Error listing accounts", "err", err) @@ -256,12 +255,12 @@ func (ui *CommandlineUI) showAccounts() { fmt.Print("No accounts found\n") return } - if len(accounts) < limit { - limit = len(accounts) - msg = "" + if limit := 20; len(accounts) > limit { + msg = fmt.Sprintf("\nFirst %d accounts listed (%d more available).\n", limit, len(accounts)-limit) + accounts = accounts[:limit] } fmt.Fprint(out, "\n------- Available accounts -------\n") - for i, account := range accounts[:limit] { + for i, account := range accounts { fmt.Fprintf(out, "%d. %s at %s\n", i, account.Address, account.URL) } fmt.Print(out.String(), msg) From 8564a40c0908ffd2df70484255f0e64598094dd7 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Tue, 8 Nov 2022 20:55:01 +0100 Subject: [PATCH 5/5] signer/core: tiny refactor --- signer/core/cliui.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 97a8b15931e9..b1bd3206ed3f 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -245,8 +245,6 @@ func (ui *CommandlineUI) OnApprovedTx(tx ethapi.SignTransactionResult) { func (ui *CommandlineUI) showAccounts() { accounts, err := ui.api.ListAccounts(context.Background()) - var msg string = "" - var out = new(strings.Builder) if err != nil { log.Error("Error listing accounts", "err", err) return @@ -255,6 +253,8 @@ func (ui *CommandlineUI) showAccounts() { fmt.Print("No accounts found\n") return } + var msg string + var out = new(strings.Builder) if limit := 20; len(accounts) > limit { msg = fmt.Sprintf("\nFirst %d accounts listed (%d more available).\n", limit, len(accounts)-limit) accounts = accounts[:limit]