Merge pull request #1398 from ipfs/tk/publish-local-peer-id

core/commands/publish: Allow explicit local node ID

core/commands/publish.go

@@ -72,16 +72,19 @@ Publish an <ipfs-path> to another public key (not implemented):
 			return
 		}
 
+		var name string
 		var pstr string
 
 		switch len(args) {
 		case 2:
-			// name = args[0]
+			name = args[0]
 			pstr = args[1]
+			if name != n.Identity.Pretty() {
 				res.SetError(errors.New("keychains not yet implemented"), cmds.ErrNormal)
 				return
+			}
 		case 1:
-			// name = n.Identity.ID.String()
+			// name = n.Identity.Pretty()
 			pstr = args[0]
 		}
 

test/sharness/t0100-name.sh

@@ -52,4 +52,16 @@ test_expect_success "resolve output looks good" '
 	test_cmp output expected4
 '
 
+# publish with an explicit node ID
+
+test_expect_success "'ipfs name publish <local-id> <hash>' succeeds" '
+	PEERID=`ipfs id --format="<id>"` &&
+	ipfs name publish "${PEERID}" "/ipfs/$HASH_WELCOME_DOCS" >actual_node_id_publish
+'
+
+test_expect_success "publish with our explicit node ID looks good" '
+	echo "Published to ${PEERID}: /ipfs/$HASH_WELCOME_DOCS" >expected_node_id_publish &&
+	test_cmp expected_node_id_publish actual_node_id_publish
+'
+
 test_done