diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-02-27 19:17:58 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2017-02-27 19:17:58 +0800 |
commit | 46eea4d10533f9376e0d36255dfc1083e28d5bbc (patch) | |
tree | 4f80e73cfe0577cd83649446f2021857d9f41b2f /accounts | |
parent | 0a63c3e3625e9f5e18f6c2a95934a37b1dcac6c7 (diff) | |
download | dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar.gz dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar.bz2 dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar.lz dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar.xz dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.tar.zst dexon-46eea4d10533f9376e0d36255dfc1083e28d5bbc.zip |
accounts, eth/downloader: use "err" instead of "error" in logs
Diffstat (limited to 'accounts')
-rw-r--r-- | accounts/abi/bind/util.go | 2 | ||||
-rw-r--r-- | accounts/keystore/account_cache.go | 6 | ||||
-rw-r--r-- | accounts/keystore/watch.go | 2 | ||||
-rw-r--r-- | accounts/usbwallet/ledger_wallet.go | 10 |
4 files changed, 10 insertions, 10 deletions
diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index ca79694ef..50b7a6f02 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -39,7 +39,7 @@ func WaitMined(ctx context.Context, b DeployBackend, tx *types.Transaction) (*ty return receipt, nil } if err != nil { - logger.Trace("Receipt retrieval failed", "error", err) + logger.Trace("Receipt retrieval failed", "err", err) } else { logger.Trace("Transaction not yet mined") } diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 866f8ae7b..2324e128d 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -210,7 +210,7 @@ func (ac *accountCache) close() { func (ac *accountCache) reload() { accounts, err := ac.scan() if err != nil { - log.Debug("Failed to reload keystore contents", "error", err) + log.Debug("Failed to reload keystore contents", "err", err) } ac.all = accounts sort.Sort(ac.all) @@ -250,7 +250,7 @@ func (ac *accountCache) scan() ([]accounts.Account, error) { fd, err := os.Open(path) if err != nil { - logger.Trace("Failed to open keystore file", "error", err) + logger.Trace("Failed to open keystore file", "err", err) continue } buf.Reset(fd) @@ -260,7 +260,7 @@ func (ac *accountCache) scan() ([]accounts.Account, error) { addr := common.HexToAddress(keyJSON.Address) switch { case err != nil: - logger.Debug("Failed to decode keystore key", "error", err) + logger.Debug("Failed to decode keystore key", "err", err) case (addr == common.Address{}): logger.Debug("Failed to decode keystore key", "error", "missing or zero address") default: diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index ae97805be..f4d647791 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -66,7 +66,7 @@ func (w *watcher) loop() { logger := log.New("path", w.ac.keydir) if err := notify.Watch(w.ac.keydir, w.ev, notify.All); err != nil { - logger.Trace("Failed to watch keystore folder", "error", err) + logger.Trace("Failed to watch keystore folder", "err", err) return } defer notify.Stop(w.ev) diff --git a/accounts/usbwallet/ledger_wallet.go b/accounts/usbwallet/ledger_wallet.go index 6086660f9..37e04e598 100644 --- a/accounts/usbwallet/ledger_wallet.go +++ b/accounts/usbwallet/ledger_wallet.go @@ -262,7 +262,7 @@ func (w *ledgerWallet) heartbeat() { } // In case of error, wait for termination if err != nil { - w.logger.Debug("Ledger health-check failed", "error", err) + w.logger.Debug("Ledger health-check failed", "err", err) errc = <-w.healthQuit } errc <- err @@ -396,7 +396,7 @@ func (w *ledgerWallet) selfDerive() { // Retrieve the next derived Ethereum account if nextAddr == (common.Address{}) { if nextAddr, err = w.ledgerDerive(nextPath); err != nil { - w.logger.Warn("Ledger account derivation failed", "error", err) + w.logger.Warn("Ledger account derivation failed", "err", err) break } } @@ -407,12 +407,12 @@ func (w *ledgerWallet) selfDerive() { ) balance, err = w.deriveChain.BalanceAt(context, nextAddr, nil) if err != nil { - w.logger.Warn("Ledger balance retrieval failed", "error", err) + w.logger.Warn("Ledger balance retrieval failed", "err", err) break } nonce, err = w.deriveChain.NonceAt(context, nextAddr, nil) if err != nil { - w.logger.Warn("Ledger nonce retrieval failed", "error", err) + w.logger.Warn("Ledger nonce retrieval failed", "err", err) break } // If the next account is empty, stop self-derivation, but add it nonetheless @@ -471,7 +471,7 @@ func (w *ledgerWallet) selfDerive() { } // In case of error, wait for termination if err != nil { - w.logger.Debug("Ledger self-derivation failed", "error", err) + w.logger.Debug("Ledger self-derivation failed", "err", err) errc = <-w.deriveQuit } errc <- err |