cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: fix staticcheck/vet errors

Browse Source
This commit is contained in:
Hector Sanjuan 2022-03-11 16:47:41 +01:00
parent 3029972750
commit 0c556ef4fa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/pinsvcapi/pinsvc/pinsvc.go
View File

@ -83,7 +83,6 @@ func (p Pin) MatchesName(nameOpt string, strategy MatchingStrategy) bool {
default: default:
return true return true
} }
return false
} }
// MatchesMeta returns true if the pin status metadata matches the given. The // MatchesMeta returns true if the pin status metadata matches the given. The

13
util.go
View File

@ -12,7 +12,6 @@ import (
cid "github.com/ipfs/go-cid" cid "github.com/ipfs/go-cid"
"github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/api"
peer "github.com/libp2p/go-libp2p-core/peer" peer "github.com/libp2p/go-libp2p-core/peer"
"github.com/multiformats/go-multiaddr"
ma "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr"
madns "github.com/multiformats/go-multiaddr-dns" madns "github.com/multiformats/go-multiaddr-dns"
) )
@ -187,15 +186,15 @@ func pingValueFromMetric(m *api.Metric) (pv pingValue) {
func publicIPFSAddresses(in []api.Multiaddr) []api.Multiaddr { func publicIPFSAddresses(in []api.Multiaddr) []api.Multiaddr {
var out []api.Multiaddr var out []api.Multiaddr
for _, ma := range in { for _, maddr := range in {
if madns.Matches(ma.Value()) { // a dns multiaddress: take it if madns.Matches(maddr.Value()) { // a dns multiaddress: take it
out = append(out, ma) out = append(out, maddr)
continue continue
} }
ip, err := ma.ValueForProtocol(multiaddr.P_IP4) ip, err := maddr.ValueForProtocol(ma.P_IP4)
if err != nil { if err != nil {
ip, err = ma.ValueForProtocol(multiaddr.P_IP6) ip, err = maddr.ValueForProtocol(ma.P_IP6)
if err != nil { if err != nil {
continue continue
} }
@ -210,7 +209,7 @@ func publicIPFSAddresses(in []api.Multiaddr) []api.Multiaddr {
if !netip.IsGlobalUnicast() { if !netip.IsGlobalUnicast() {
continue continue
} }
out = append(out, ma) out = append(out, maddr)
} }
return out return out
} }