fix: modify key type name (#145)

* fix: modify key type name * chore: fix lint error
Finschia · Apr 26, 2021 · ff6eab4 · ff6eab4
1 parent 60ec2db
commit ff6eab4
Show file tree

Hide file tree

Showing 46 changed files with 107 additions and 1,498 deletions.
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -740,7 +740,7 @@ paths:
                         properties:
                           type:
                             type: string
-                            example: tendermint/PubKeySecp256k1
+                            example: ostracon/PubKeySecp256k1
                           value:
                             type: string
                             example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -888,7 +888,7 @@ paths:
                               properties:
                                 type:
                                   type: string
-                                  example: tendermint/PubKeySecp256k1
+                                  example: ostracon/PubKeySecp256k1
                                 value:
                                   type: string
                                   example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -979,7 +979,7 @@ paths:
                         properties:
                           type:
                             type: string
-                            example: tendermint/PubKeySecp256k1
+                            example: ostracon/PubKeySecp256k1
                           value:
                             type: string
                             example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -1131,7 +1131,7 @@ paths:
                         properties:
                           type:
                             type: string
-                            example: tendermint/PubKeySecp256k1
+                            example: ostracon/PubKeySecp256k1
                           value:
                             type: string
                             example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -1219,7 +1219,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -1381,7 +1381,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -1603,7 +1603,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -1812,7 +1812,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -2030,7 +2030,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -2632,7 +2632,7 @@ paths:
                         properties:
                           type:
                             type: string
-                            example: tendermint/PubKeySecp256k1
+                            example: ostracon/PubKeySecp256k1
                           value:
                             type: string
                             example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -2682,7 +2682,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -2851,7 +2851,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -3083,7 +3083,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -3356,7 +3356,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -3572,7 +3572,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -3916,7 +3916,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -4069,7 +4069,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -4215,7 +4215,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -4445,7 +4445,7 @@ paths:
                     properties:
                       type:
                         type: string
-                        example: tendermint/PubKeySecp256k1
+                        example: ostracon/PubKeySecp256k1
                       value:
                         type: string
                         example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -28804,7 +28804,7 @@ definitions:
                 properties:
                   type:
                     type: string
-                    example: tendermint/PubKeySecp256k1
+                    example: ostracon/PubKeySecp256k1
                   value:
                     type: string
                     example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -28900,7 +28900,7 @@ definitions:
                       properties:
                         type:
                           type: string
-                          example: tendermint/PubKeySecp256k1
+                          example: ostracon/PubKeySecp256k1
                         value:
                           type: string
                           example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH
@@ -28967,7 +28967,7 @@ definitions:
             properties:
               type:
                 type: string
-                example: tendermint/PubKeySecp256k1
+                example: ostracon/PubKeySecp256k1
               value:
                 type: string
                 example: Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH

diff --git a/client/docs/swagger_legacy.yaml b/client/docs/swagger_legacy.yaml
@@ -2155,7 +2155,7 @@ definitions:
             properties:
               type:
                 type: string
-                example: "tendermint/PubKeySecp256k1"
+                example: "ostracon/PubKeySecp256k1"
               value:
                 type: string
                 example: "Avz04VhtKJh8ACCVzlI8aTosGy0ikFXKIVHQ3jKMrosH"

diff --git a/client/keys/add_ledger_test.go b/client/keys/add_ledger_test.go
@@ -74,7 +74,7 @@ func Test_runAddCmdLedgerWithCustomCoinType(t *testing.T) {
 	require.Equal(t, "keyname1", key1.GetName())
 	require.Equal(t, keyring.TypeLedger, key1.GetType())
 	require.Equal(t,
-		"terrapub1addwnpepqvpg7r26nl2pvqqern00m6s9uaax3hauu2rzg8qpjzq9hy6xve7sw0d84m6",
+		"terrapub1cqmsrdepqvpg7r26nl2pvqqern00m6s9uaax3hauu2rzg8qpjzq9hy6xve7swm8dz8g",
 		sdk.MustBech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, key1.GetPubKey()))
 
 	config.SetCoinType(438)
@@ -122,6 +122,6 @@ func Test_runAddCmdLedger(t *testing.T) {
 	require.Equal(t, "keyname1", key1.GetName())
 	require.Equal(t, keyring.TypeLedger, key1.GetType())
 	require.Equal(t,
-		"linkpub1addwnpepq27djm9tzq3sftqsayx95refxk8r5jn0kyshhql9mdjhjx829zlvzszgelc",
+		"linkpub1cqmsrdepq27djm9tzq3sftqsayx95refxk8r5jn0kyshhql9mdjhjx829zlvzygzwr2",
 		sdk.MustBech32ifyPubKey(sdk.Bech32PubKeyTypeAccPub, key1.GetPubKey()))
 }
diff --git a/client/keys/import_test.go b/client/keys/import_test.go
@@ -32,14 +32,15 @@ func Test_runImportCmd(t *testing.T) {
 	})
 
 	keyfile := filepath.Join(kbHome, "key.asc")
-	armoredKey := `-----BEGIN TENDERMINT PRIVATE KEY-----
-salt: A790BB721D1C094260EA84F5E5B72289
+	armoredKey := `-----BEGIN OSTRACON PRIVATE KEY-----
 kdf: bcrypt
+salt: A278E4F0DC466EF58CC9FC3149688593
+type: secp256k1
 
-HbP+c6JmeJy9JXe2rbbF1QtCX1gLqGcDQPBXiCtFvP7/8wTZtVOPj8vREzhZ9ElO
-3P7YnrzPQThG0Q+ZnRSbl9MAS8uFAM4mqm5r/Ys=
-=f3l4
------END TENDERMINT PRIVATE KEY-----
+mSB5rEfN4VCi1EnEca5PigV/WphYtrBFft+QyZ2ISztMeQmuhFNFWwjLBsJm5zXv
+KNXMn0ZEeCZtbyNzPPdQUQBwcbueq9vx5NDqQCg=
+=wp9z
+-----END OSTRACON PRIVATE KEY-----
 `
 	require.NoError(t, ioutil.WriteFile(keyfile, []byte(armoredKey), 0644))
 

diff --git a/client/keys/migrate.go b/client/keys/migrate.go