clean deprecated Key.Pretty()
License: MIT Signed-off-by: Michael Muré <batolettre@gmail.com>
Michael Muré committed
Mar 20, 2016 at 17:07 UTC
c88e46cb52654c9ecea5888e3d58ec4f289816b9
12 files changed
+17
-23
blocks/blockstore/blockstore_test.go
+1
-1
@@ -82,7 +82,7 @@ func TestAllKeysSimple(t *testing.T) {
82
keys2 := collect(ch)
83
84
// for _, k2 := range keys2 {
85
- // t.Log("found ", k2.Pretty())
85
+ // t.Log("found ", k2.B58String())
86
// }
87
88
expectMatches(t, keys, keys2)
blocks/key/key.go
-6
@@ -14,12 +14,6 @@ type Key string
14
15
// String is utililty function for printing out keys as strings (Pretty).
16
func (k Key) String() string {
17
- return k.Pretty()
18
-}
19
-
20
-// Pretty returns Key in a b58 encoded string
21
-// TODO: deprecate Pretty. bad name.
22
-func (k Key) Pretty() string {
17
return k.B58String()
18
}
19
core/commands/block.go
+1
-1
@@ -65,7 +65,7 @@ on raw ipfs blocks. It outputs the following to stdout:
65
}
66
67
res.SetOutput(&BlockStat{
68
- Key: b.Key().Pretty(),
68
+ Key: b.Key().B58String(),
69
Size: len(b.Data),
70
})
71
},
core/commands/object/object.go
+1
-1
@@ -550,7 +550,7 @@ func getOutput(dagnode *dag.Node) (*Object, error) {
550
}
551
552
output := &Object{
553
- Hash: key.Pretty(),
553
+ Hash: key.B58String(),
554
Links: make([]Link, len(dagnode.Links)),
555
}
556
core/commands/refs.go
+5
-5
@@ -176,7 +176,7 @@ Displays the hashes of all local objects.
176
defer pipew.Close()
177
178
for k := range allKeys {
179
- s := k.Pretty() + "\n"
179
+ s := k.B58String() + "\n"
180
if _, err := pipew.Write([]byte(s)); err != nil {
181
log.Error("pipe write error: ", err)
182
return
@@ -314,13 +314,13 @@ func (rw *RefWriter) WriteEdge(from, to key.Key, linkname string) error {
314
switch {
315
case rw.PrintFmt != "":
316
s = rw.PrintFmt
317
- s = strings.Replace(s, "<src>", from.Pretty(), -1)
318
- s = strings.Replace(s, "<dst>", to.Pretty(), -1)
317
+ s = strings.Replace(s, "<src>", from.B58String(), -1)
318
+ s = strings.Replace(s, "<dst>", to.B58String(), -1)
319
s = strings.Replace(s, "<linkname>", linkname, -1)
320
case rw.PrintEdge:
321
- s = from.Pretty() + " -> " + to.Pretty()
321
+ s = from.B58String() + " -> " + to.B58String()
322
default:
323
- s += to.Pretty()
323
+ s += to.B58String()
324
}
325
326
rw.out <- &RefWrapper{Ref: s}
core/coreunix/add.go
+2
-2
@@ -323,7 +323,7 @@ func (adder *Adder) addNode(node *dag.Node, path string) error {
323
return err
324
}
325
326
- path = key.Pretty()
326
+ path = key.B58String()
327
}
328
329
dir := gopath.Dir(path)
@@ -479,7 +479,7 @@ func getOutput(dagnode *dag.Node) (*Object, error) {
479
}
480
481
output := &Object{
482
- Hash: key.Pretty(),
482
+ Hash: key.B58String(),
483
Links: make([]Link, len(dagnode.Links)),
484
}
485
exchange/bitswap/message/message.go
+1
-1
@@ -173,7 +173,7 @@ func (m *impl) ToNet(w io.Writer) error {
173
func (m *impl) Loggable() map[string]interface{} {
174
var blocks []string
175
for _, v := range m.blocks {
176
- blocks = append(blocks, v.Key().Pretty())
176
+ blocks = append(blocks, v.Key().B58String())
177
}
178
return map[string]interface{}{
179
"blocks": blocks,
fuse/ipns/ipns_unix.go
+1
-1
@@ -241,7 +241,7 @@ func (r *Root) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
241
continue
242
}
243
ent := fuse.Dirent{
244
- Name: key.Key(hash).Pretty(),
244
+ Name: key.Key(hash).B58String(),
245
Type: fuse.DT_Dir,
246
}
247
link := fuse.Dirent{
fuse/readonly/readonly_unix.go
+1
-1
@@ -171,7 +171,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
171
// setup our logging event
172
lm := make(lgbl.DeferredMap)
173
lm["fs"] = "ipfs"
174
- lm["key"] = func() interface{} { return k.Pretty() }
174
+ lm["key"] = func() interface{} { return k.B58String() }
175
lm["req_offset"] = req.Offset
176
lm["req_size"] = req.Size
177
defer log.EventBegin(ctx, "fuseRead", lm).Done()
namesys/resolve_test.go
+1
-1
@@ -42,7 +42,7 @@ func TestRoutingResolve(t *testing.T) {
42
}
43
44
pkhash := u.Hash(pubkb)
45
- res, err := resolver.Resolve(context.Background(), key.Key(pkhash).Pretty())
45
+ res, err := resolver.Resolve(context.Background(), key.Key(pkhash).B58String())
46
if err != nil {
47
t.Fatal(err)
48
}
routing/dht/handlers.go
+2
-2
@@ -210,7 +210,7 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.
210
211
resp := pb.NewMessage(pmes.GetType(), pmes.GetKey(), pmes.GetClusterLevel())
212
key := key.Key(pmes.GetKey())
213
- lm["key"] = func() interface{} { return key.Pretty() }
213
+ lm["key"] = func() interface{} { return key.B58String() }
214
215
// debug logging niceness.
216
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
254
255
defer log.EventBegin(ctx, "handleAddProvider", lm).Done()
256
key := key.Key(pmes.GetKey())
257
- lm["key"] = func() interface{} { return key.Pretty() }
257
+ lm["key"] = func() interface{} { return key.B58String() }
258
259
log.Debugf("%s adding %s as a provider for '%s'\n", dht.self, p, key)
260
routing/dht/pb/message.go
+1
-1
@@ -143,7 +143,7 @@ func (m *Message) Loggable() map[string]interface{} {
143
return map[string]interface{}{
144
"message": map[string]string{
145
"type": m.Type.String(),
146
- "key": key.Key(m.GetKey()).Pretty(),
146
+ "key": key.Key(m.GetKey()).B58String(),
147
},
148
}
149
}