certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename InfoImporter -> LegacyInfoImporter (#8739) 

Avoid namespace clash with the InfoImporter interface
that already exists in the v0.41 release series.
This commit is contained in:
Alessio Treglia 2021-03-01 20:09:01 +00:00 committed by GitHub
parent 1c6e267964
commit 010eeef457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/keys/migrate.go
View File

@ -111,7 +111,7 @@ func runMigrateCmd(cmd *cobra.Command, args []string) error {
// TypeLocal needs an additional step to ask password. // TypeLocal needs an additional step to ask password.
// The other keyring types are handled by ImportInfo. // The other keyring types are handled by ImportInfo.
if keyType != keyring.TypeLocal { if keyType != keyring.TypeLocal {
infoImporter, ok := migrator.(keyring.InfoImporter) infoImporter, ok := migrator.(keyring.LegacyInfoImporter)
if !ok { if !ok {
return fmt.Errorf("the Keyring implementation does not support import operations of Info types") return fmt.Errorf("the Keyring implementation does not support import operations of Info types")
} }

4
crypto/keyring/keyring.go
View File

@ -116,8 +116,8 @@ type Importer interface {
ImportPubKey(uid string, armor string) error ImportPubKey(uid string, armor string) error
} }
// InfoImporter is implemented by key stores that support import of Info types. // LegacyInfoImporter is implemented by key stores that support import of Info types.
type InfoImporter interface { type LegacyInfoImporter interface {
// ImportInfo import a keyring.Info into the current keyring. // ImportInfo import a keyring.Info into the current keyring.
// It is used to migrate multisig, ledger, and public key Info structure. // It is used to migrate multisig, ledger, and public key Info structure.
ImportInfo(oldInfo Info) error ImportInfo(oldInfo Info) error