Merge pull request #3734 from ipfs/feat/keystore/list-self

keystore: add self key to the listing
ipfs · Mar 2, 2017 · 57e4e21 · 57e4e21
2 parents 1ef5ecb + fe0cc96
commit 57e4e21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/core/commands/keystore.go b/core/commands/keystore.go
@@ -40,7 +40,7 @@ var KeyGenCmd = &cmds.Command{
 		Tagline: "Create a new keypair",
 	},
 	Options: []cmds.Option{
-		cmds.StringOption("type", "t", "type of the key to create"),
+		cmds.StringOption("type", "t", "type of the key to create [rsa, ed25519]"),
 		cmds.IntOption("size", "s", "size of the key to generate"),
 	},
 	Arguments: []cmds.Argument{
@@ -160,7 +160,9 @@ var KeyListCmd = &cmds.Command{
 
 		sort.Strings(keys)
 
-		list := make([]KeyOutput, 0, len(keys))
+		list := make([]KeyOutput, 0, len(keys)+1)
+
+		list = append(list, KeyOutput{Name: "self", Id: n.Identity.Pretty()})
 
 		for _, key := range keys {
 			privKey, err := n.Repo.Keystore().Get(key)

diff --git a/test/sharness/t0165-keystore.sh b/test/sharness/t0165-keystore.sh
@@ -22,6 +22,7 @@ test_key_cmd() {
 	test_expect_success "both keys show up in list output" '
 		echo bazed > list_exp &&
 		echo foobarsa >> list_exp &&
+		echo self >> list_exp
 		ipfs key list | sort > list_out &&
 		test_cmp list_exp list_out
 	'
@@ -30,6 +31,11 @@ test_key_cmd() {
 		ipfs key list -l | grep $edhash > /dev/null &&
 		ipfs key list -l | grep $rsahash > /dev/null
 	'
+
+	test_expect_success "key list -l contains self key with peerID" '
+		PeerID="$(ipfs config Identity.PeerID)"
+		ipfs key list -l | grep "$PeerID self"
+	'
 }
 
 test_key_cmd