fix: move away from deprecated peer ID functions
Steven Allen committed
Dec 14, 2019 at 19:48 UTC
8f3b2740806ba32c7b86d7c730632b16263fdd84
9 files changed
+12
-12
core/commands/bitswap.go
+2
-2
@@ -60,7 +60,7 @@ Print out all blocks currently on the bitswap wantlist for the local peer.`,
60
61
pstr, found := req.Options[peerOptionName].(string)
62
if found {
63
- pid, err := peer.IDB58Decode(pstr)
63
+ pid, err := peer.Decode(pstr)
64
if err != nil {
65
return err
66
}
@@ -195,7 +195,7 @@ prints the ledger associated with a given peer.
195
return e.TypeErr(bs, nd.Exchange)
196
}
197
198
- partner, err := peer.IDB58Decode(req.Arguments[0])
198
+ partner, err := peer.Decode(req.Arguments[0])
199
if err != nil {
200
return err
201
}
core/commands/dht.go
+2
-2
@@ -68,7 +68,7 @@ var queryDhtCmd = &cmds.Command{
68
return ErrNotDHT
69
}
70
71
- id, err := peer.IDB58Decode(req.Arguments[0])
71
+ id, err := peer.Decode(req.Arguments[0])
72
if err != nil {
73
return cmds.ClientError("invalid peer ID")
74
}
@@ -370,7 +370,7 @@ var findPeerDhtCmd = &cmds.Command{
370
return ErrNotOnline
371
}
372
373
- pid, err := peer.IDB58Decode(req.Arguments[0])
373
+ pid, err := peer.Decode(req.Arguments[0])
374
if err != nil {
375
return err
376
}
core/commands/id.go
+1
-1
@@ -75,7 +75,7 @@ EXAMPLE:
75
var id peer.ID
76
if len(req.Arguments) > 0 {
77
var err error
78
- id, err = peer.IDB58Decode(req.Arguments[0])
78
+ id, err = peer.Decode(req.Arguments[0])
79
if err != nil {
80
return fmt.Errorf("invalid peer id")
81
}
core/commands/name/ipnsps.go
+2
-2
@@ -93,7 +93,7 @@ var ipnspsSubsCmd = &cmds.Command{
93
log.Errorf("ipns key not a valid peer ID: %s", err)
94
continue
95
}
96
- paths = append(paths, "/ipns/"+peer.IDB58Encode(pid))
96
+ paths = append(paths, "/ipns/"+peer.Encode(pid))
97
}
98
99
return cmds.EmitOnce(res, &stringList{paths})
@@ -120,7 +120,7 @@ var ipnspsCancelCmd = &cmds.Command{
120
121
name := req.Arguments[0]
122
name = strings.TrimPrefix(name, "/ipns/")
123
- pid, err := peer.IDB58Decode(name)
123
+ pid, err := peer.Decode(name)
124
if err != nil {
125
return cmds.Errorf(cmds.ErrClient, err.Error())
126
}
core/commands/ping.go
+1
-1
@@ -217,6 +217,6 @@ func ParsePeerParam(text string) (ma.Multiaddr, peer.ID, error) {
217
return transport, id, nil
218
}
219
// Raw peer ID
220
- p, err := peer.IDB58Decode(text)
220
+ p, err := peer.Decode(text)
221
return nil, p, err
222
}
core/commands/stat.go
+1
-1
@@ -109,7 +109,7 @@ Example:
109
110
var pid peer.ID
111
if pfound {
112
- checkpid, err := peer.IDB58Decode(pstr)
112
+ checkpid, err := peer.Decode(pstr)
113
if err != nil {
114
return err
115
}
core/node/groups.go
+1
-1
@@ -154,7 +154,7 @@ func Identity(cfg *config.Config) fx.Option {
154
return fx.Error(errors.New("no peer ID in config! (was 'ipfs init' run?)"))
155
}
156
157
- id, err := peer.IDB58Decode(cid)
157
+ id, err := peer.Decode(cid)
158
if err != nil {
159
return fx.Error(fmt.Errorf("peer ID invalid: %s", err))
160
}
namesys/namesys.go
+1
-1
@@ -189,6 +189,6 @@ func (ns *mpns) PublishWithEOL(ctx context.Context, name ci.PrivKey, value path.
189
if ttEol := time.Until(eol); ttEol < ttl {
190
ttl = ttEol
191
}
192
- ns.cacheSet(peer.IDB58Encode(id), value, ttl)
192
+ ns.cacheSet(peer.Encode(id), value, ttl)
193
return nil
194
}
namesys/routing.go
+1
-1
@@ -59,7 +59,7 @@ func (r *IpnsResolver) resolveOnceAsync(ctx context.Context, name string, option
59
}
60
61
name = strings.TrimPrefix(name, "/ipns/")
62
- pid, err := peer.IDB58Decode(name)
62
+ pid, err := peer.Decode(name)
63
if err != nil {
64
log.Debugf("RoutingResolver: could not convert public key hash %s to peer ID: %s\n", name, err)
65
out <- onceResult{err: err}