added .Key

merkledag/merkledag.go

 package merkledag
 
 import (
+	u "github.com/jbenet/go-ipfs/util"
 	mh "github.com/jbenet/go-multihash"
 )
 
+// can't use []byte/Multihash for keys :(
+// so have to convert Multihash bytes to string
+type NodeMap map[u.Key]*Node
+
 // A node in the IPFS Merkle DAG.
 // nodes have opaque data and a set of navigable links.
 type Node struct {
@@ -24,6 +29,9 @@ type Link struct {
 
 	// multihash of the target object
 	Hash mh.Multihash
+
+	// a ptr to the actual node for graph manipulation
+	Node *Node
 }
 
 func (n *Node) AddNodeLink(name string, that *Node) error {
@@ -66,3 +74,8 @@ func (n *Node) Multihash() (mh.Multihash, error) {
 
 	return mh.Sum(b, mh.SHA2_256, -1)
 }
+
+func (n *Node) Key() (u.Key, error) {
+	h, err := n.Multihash()
+	return u.Key(h), err
+}

merkledag/merkledag_test.go

@@ -2,7 +2,7 @@ package merkledag
 
 import (
 	"fmt"
-	// mh "github.com/jbenet/go-multihash"
+	u "github.com/jbenet/go-ipfs/util"
 	"testing"
 )
 
@@ -40,6 +40,15 @@ func TestNode(t *testing.T) {
 		} else {
 			fmt.Println("hash:", h)
 		}
+
+		k, err := n.Key()
+		if err != nil {
+			t.Error(err)
+		} else if k != u.Key(h) {
+			t.Error("Key is not equivalent to multihash")
+		} else {
+			fmt.Println("key: ", k)
+		}
 	}
 
 	printn("beep", n1)

peer/peer.go

 package peer
 
 import (
+	u "github.com/jbenet/go-ipfs/util"
 	ma "github.com/jbenet/go-multiaddr"
 	mh "github.com/jbenet/go-multihash"
 )
 
 type PeerId mh.Multihash
 
-// have to map string : *Peer because slices are not comparable.
-type PeerBook map[string]*Peer
+// have to map Key (string) : *Peer because slices are not comparable.
+type PeerBook map[u.Key]*Peer
 
 type Peer struct {
 	Id        PeerId