From 1b7b8afbaea0b1a33f2b0e4dfa9255e077e5130b Mon Sep 17 00:00:00 2001 From: Andrei Ivasko Date: Sat, 18 Sep 2021 16:33:47 +0300 Subject: [PATCH] fix error output at privKeyFromLegacyInfo --- crypto/keyring/keyring_ledger_test.go | 3 ++- crypto/keyring/keyring_test.go | 2 +- crypto/keyring/legacy_info.go | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/keyring/keyring_ledger_test.go b/crypto/keyring/keyring_ledger_test.go index c7e4727a6af..b57351ba947 100644 --- a/crypto/keyring/keyring_ledger_test.go +++ b/crypto/keyring/keyring_ledger_test.go @@ -1,4 +1,5 @@ -//+build ledger test_ledger_mock +//go:build ledger || test_ledger_mock +// +build ledger test_ledger_mock package keyring diff --git a/crypto/keyring/keyring_test.go b/crypto/keyring/keyring_test.go index f5a00b4f29d..6fc968240b2 100644 --- a/crypto/keyring/keyring_test.go +++ b/crypto/keyring/keyring_test.go @@ -1317,7 +1317,7 @@ func TestRenameKey(t *testing.T) { newRecord, err := kr.Key(newKeyUID) // new key should be in keyring require.NoError(t, err) requireEqualRenamedKey(t, newRecord, oldKeyRecord, false) // oldKeyRecord and newRecord should be the same except name - oldKeyRecord, err = kr.Key(oldKeyUID) // old key should be gone from keyring + oldKeyRecord, err = kr.Key(oldKeyUID) // old key should be gone from keyring require.Error(t, err) }, }, diff --git a/crypto/keyring/legacy_info.go b/crypto/keyring/legacy_info.go index dda0e1715d5..0480fa5eb26 100644 --- a/crypto/keyring/legacy_info.go +++ b/crypto/keyring/legacy_info.go @@ -1,7 +1,6 @@ package keyring import ( - "errors" "fmt" "github.com/cosmos/cosmos-sdk/codec/legacy" @@ -268,6 +267,6 @@ func privKeyFromLegacyInfo(info LegacyInfo) (cryptotypes.PrivKey, error) { return priv, nil // case legacyLedgerInfo, legacyOfflineInfo, LegacyMultiInfo: default: - return nil, errors.New("only works on local private keys") + return nil, fmt.Errorf("only works on local private keys, provided %s", linfo) } }