diff --git a/blocks/blockstore/blockstore_test.go b/blocks/blockstore/blockstore_test.go index 685745f00..4987f9670 100644 --- a/blocks/blockstore/blockstore_test.go +++ b/blocks/blockstore/blockstore_test.go @@ -82,7 +82,7 @@ func TestAllKeysSimple(t *testing.T) { keys2 := collect(ch) // for _, k2 := range keys2 { - // t.Log("found ", k2.Pretty()) + // t.Log("found ", k2.B58String()) // } expectMatches(t, keys, keys2) diff --git a/blocks/key/key.go b/blocks/key/key.go index edb5de5c2..b0db2c55e 100644 --- a/blocks/key/key.go +++ b/blocks/key/key.go @@ -14,12 +14,6 @@ type Key string // String is utililty function for printing out keys as strings (Pretty). func (k Key) String() string { - return k.Pretty() -} - -// Pretty returns Key in a b58 encoded string -// TODO: deprecate Pretty. bad name. -func (k Key) Pretty() string { return k.B58String() } diff --git a/core/commands/block.go b/core/commands/block.go index 234c30e15..5f9ed2d4c 100644 --- a/core/commands/block.go +++ b/core/commands/block.go @@ -65,7 +65,7 @@ on raw ipfs blocks. It outputs the following to stdout: } res.SetOutput(&BlockStat{ - Key: b.Key().Pretty(), + Key: b.Key().B58String(), Size: len(b.Data), }) }, diff --git a/core/commands/object/object.go b/core/commands/object/object.go index b2f13d01f..f16ef7160 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -550,7 +550,7 @@ func getOutput(dagnode *dag.Node) (*Object, error) { } output := &Object{ - Hash: key.Pretty(), + Hash: key.B58String(), Links: make([]Link, len(dagnode.Links)), } diff --git a/core/commands/refs.go b/core/commands/refs.go index 73fd67da7..4c637fd22 100644 --- a/core/commands/refs.go +++ b/core/commands/refs.go @@ -176,7 +176,7 @@ Displays the hashes of all local objects. defer pipew.Close() for k := range allKeys { - s := k.Pretty() + "\n" + s := k.B58String() + "\n" if _, err := pipew.Write([]byte(s)); err != nil { log.Error("pipe write error: ", err) return @@ -314,13 +314,13 @@ func (rw *RefWriter) WriteEdge(from, to key.Key, linkname string) error { switch { case rw.PrintFmt != "": s = rw.PrintFmt - s = strings.Replace(s, "", from.Pretty(), -1) - s = strings.Replace(s, "", to.Pretty(), -1) + s = strings.Replace(s, "", from.B58String(), -1) + s = strings.Replace(s, "", to.B58String(), -1) s = strings.Replace(s, "", linkname, -1) case rw.PrintEdge: - s = from.Pretty() + " -> " + to.Pretty() + s = from.B58String() + " -> " + to.B58String() default: - s += to.Pretty() + s += to.B58String() } rw.out <- &RefWrapper{Ref: s} diff --git a/core/coreunix/add.go b/core/coreunix/add.go index c8a61c306..db0e100b8 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -323,7 +323,7 @@ func (adder *Adder) addNode(node *dag.Node, path string) error { return err } - path = key.Pretty() + path = key.B58String() } dir := gopath.Dir(path) @@ -479,7 +479,7 @@ func getOutput(dagnode *dag.Node) (*Object, error) { } output := &Object{ - Hash: key.Pretty(), + Hash: key.B58String(), Links: make([]Link, len(dagnode.Links)), } diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go index 632bc59f9..41496ed91 100644 --- a/exchange/bitswap/message/message.go +++ b/exchange/bitswap/message/message.go @@ -173,7 +173,7 @@ func (m *impl) ToNet(w io.Writer) error { func (m *impl) Loggable() map[string]interface{} { var blocks []string for _, v := range m.blocks { - blocks = append(blocks, v.Key().Pretty()) + blocks = append(blocks, v.Key().B58String()) } return map[string]interface{}{ "blocks": blocks, diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index 23b5614bf..ffa19f433 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -241,7 +241,7 @@ func (r *Root) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { continue } ent := fuse.Dirent{ - Name: key.Key(hash).Pretty(), + Name: key.Key(hash).B58String(), Type: fuse.DT_Dir, } link := fuse.Dirent{ diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index f2585f578..d1586f793 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -171,7 +171,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR // setup our logging event lm := make(lgbl.DeferredMap) lm["fs"] = "ipfs" - lm["key"] = func() interface{} { return k.Pretty() } + lm["key"] = func() interface{} { return k.B58String() } lm["req_offset"] = req.Offset lm["req_size"] = req.Size defer log.EventBegin(ctx, "fuseRead", lm).Done() diff --git a/namesys/resolve_test.go b/namesys/resolve_test.go index 9518552d4..742923568 100644 --- a/namesys/resolve_test.go +++ b/namesys/resolve_test.go @@ -42,7 +42,7 @@ func TestRoutingResolve(t *testing.T) { } pkhash := u.Hash(pubkb) - res, err := resolver.Resolve(context.Background(), key.Key(pkhash).Pretty()) + res, err := resolver.Resolve(context.Background(), key.Key(pkhash).B58String()) if err != nil { t.Fatal(err) } diff --git a/routing/dht/handlers.go b/routing/dht/handlers.go index ceecfa0ef..bc74af005 100644 --- a/routing/dht/handlers.go +++ b/routing/dht/handlers.go @@ -210,7 +210,7 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb. resp := pb.NewMessage(pmes.GetType(), pmes.GetKey(), pmes.GetClusterLevel()) key := key.Key(pmes.GetKey()) - lm["key"] = func() interface{} { return key.Pretty() } + lm["key"] = func() interface{} { return key.B58String() } // debug logging niceness. reqDesc := fmt.Sprintf("%s handleGetProviders(%s, %s): ", dht.self, p, key) @@ -254,7 +254,7 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.M defer log.EventBegin(ctx, "handleAddProvider", lm).Done() key := key.Key(pmes.GetKey()) - lm["key"] = func() interface{} { return key.Pretty() } + lm["key"] = func() interface{} { return key.B58String() } log.Debugf("%s adding %s as a provider for '%s'\n", dht.self, p, key) diff --git a/routing/dht/pb/message.go b/routing/dht/pb/message.go index d0ff6fa95..5b9fb4309 100644 --- a/routing/dht/pb/message.go +++ b/routing/dht/pb/message.go @@ -143,7 +143,7 @@ func (m *Message) Loggable() map[string]interface{} { return map[string]interface{}{ "message": map[string]string{ "type": m.Type.String(), - "key": key.Key(m.GetKey()).Pretty(), + "key": key.Key(m.GetKey()).B58String(), }, } }