From 894022a3d5b2aba7714eb8fad3fbba0e0b5b74ea Mon Sep 17 00:00:00 2001 From: Wenbiao Zheng Date: Tue, 24 Jul 2018 08:09:24 +0800 Subject: [PATCH] cmd/geth: clean up call to SelfDerive (#16970) --- cmd/geth/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e42aab30a..1c618de35 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -305,11 +305,11 @@ func startNode(ctx *cli.Context, stack *node.Node) { status, _ := event.Wallet.Status() log.Info("New wallet appeared", "url", event.Wallet.URL(), "status", status) + derivationPath := accounts.DefaultBaseDerivationPath if event.Wallet.URL().Scheme == "ledger" { - event.Wallet.SelfDerive(accounts.DefaultLedgerBaseDerivationPath, stateReader) - } else { - event.Wallet.SelfDerive(accounts.DefaultBaseDerivationPath, stateReader) + derivationPath = accounts.DefaultLedgerBaseDerivationPath } + event.Wallet.SelfDerive(derivationPath, stateReader) case accounts.WalletDropped: log.Info("Old wallet dropped", "url", event.Wallet.URL())