cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #8993 from filecoin-project/fix-peer-idfromstring

Browse Source 
fix incorrect usage of peer.IDFromString (should be peer.Decode)
This commit is contained in:
Aayush Rajasekaran 2022-07-07 18:05:00 -04:00 committed by GitHub
commit d8398ed037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/impl/net/rcmgr.go
View File

@ -82,7 +82,7 @@ func (a *NetAPI) NetStat(ctx context.Context, scope string) (result api.NetStat,
case strings.HasPrefix(scope, "peer:"): case strings.HasPrefix(scope, "peer:"):
p := scope[5:] p := scope[5:]
pid, err := peer.IDFromString(p) pid, err := peer.Decode(p)
if err != nil { if err != nil {
return result, xerrors.Errorf("invalid peer ID: %s: %w", p, err) return result, xerrors.Errorf("invalid peer ID: %s: %w", p, err)
} }
@ -168,7 +168,7 @@ func (a *NetAPI) NetLimit(ctx context.Context, scope string) (result api.NetLimi
case strings.HasPrefix(scope, "peer:"): case strings.HasPrefix(scope, "peer:"):
p := scope[5:] p := scope[5:]
pid, err := peer.IDFromString(p) pid, err := peer.Decode(p)
if err != nil { if err != nil {
return result, xerrors.Errorf("invalid peer ID: %s: %w", p, err) return result, xerrors.Errorf("invalid peer ID: %s: %w", p, err)
} }
@ -255,7 +255,7 @@ func (a *NetAPI) NetSetLimit(ctx context.Context, scope string, limit api.NetLim
case strings.HasPrefix(scope, "peer:"): case strings.HasPrefix(scope, "peer:"):
p := scope[5:] p := scope[5:]
pid, err := peer.IDFromString(p) pid, err := peer.Decode(p)
if err != nil { if err != nil {
return xerrors.Errorf("invalid peer ID: %s: %w", p, err) return xerrors.Errorf("invalid peer ID: %s: %w", p, err)
} }

2
node/modules/lp2p/libp2p.go
View File

@ -75,7 +75,7 @@ func ConnectionManager(low, high uint, grace time.Duration, protected []string)
} }
for _, p := range protected { for _, p := range protected {
pid, err := peer.IDFromString(p) pid, err := peer.Decode(p)
if err != nil { if err != nil {
return Libp2pOpts{}, xerrors.Errorf("failed to parse peer ID in protected peers array: %w", err) return Libp2pOpts{}, xerrors.Errorf("failed to parse peer ID in protected peers array: %w", err)
} }