chore: fix linter nits and tests that don't compile
Steven Allen committed
May 21, 2019 at 10:22 UTC
2b84b2ba13e6d3c448015c0e97860d8948e36929
5 files changed
+26
-25
core/commands/dht.go
+8
-8
@@ -494,15 +494,15 @@ Different key types can specify other 'best' rules.
494
pfm := pfuncMap{
495
notif.Value: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
496
if verbose {
497
- fmt.Fprintf(out, "got value: '%s'\n", obj.Extra)
498
- } else {
499
- res, err := base64.StdEncoding.DecodeString(obj.Extra)
500
- if err != nil {
501
- return err
502
- }
503
- out.Write(res)
497
+ _, err := fmt.Fprintf(out, "got value: '%s'\n", obj.Extra)
498
+ return err
499
}
505
- return nil
500
+ res, err := base64.StdEncoding.DecodeString(obj.Extra)
501
+ if err != nil {
502
+ return err
503
+ }
504
+ _, err = out.Write(res)
505
+ return err
506
},
507
}
508
core/commands/swarm.go
+10
-9
@@ -22,9 +22,10 @@ import (
22
peer "github.com/libp2p/go-libp2p-peer"
23
pstore "github.com/libp2p/go-libp2p-peerstore"
24
swarm "github.com/libp2p/go-libp2p-swarm"
25
+ mafilter "github.com/libp2p/go-maddr-filter"
26
ma "github.com/multiformats/go-multiaddr"
27
madns "github.com/multiformats/go-multiaddr-dns"
27
- mafilter "github.com/whyrusleeping/multiaddr-filter"
28
+ mamask "github.com/whyrusleeping/multiaddr-filter"
29
)
30
31
const (
@@ -599,8 +600,8 @@ Filters default to those specified under the "Swarm.AddrFilters" config key.
600
}
601
602
var output []string
602
- for _, f := range swrm.Filters.Filters() {
603
- s, err := mafilter.ConvertIPNet(f)
603
+ for _, f := range swrm.Filters.FiltersForAction(mafilter.ActionDeny) {
604
+ s, err := mamask.ConvertIPNet(&f)
605
if err != nil {
606
return err
607
}
@@ -657,12 +658,12 @@ add your filters to the ipfs config file.
658
}
659
660
for _, arg := range req.Arguments {
660
- mask, err := mafilter.NewMask(arg)
661
+ mask, err := mamask.NewMask(arg)
662
if err != nil {
663
return err
664
}
665
665
- swrm.Filters.AddDialFilter(mask)
666
+ swrm.Filters.AddFilter(*mask, mafilter.ActionDeny)
667
}
668
669
added, err := filtersAdd(r, cfg, req.Arguments)
@@ -716,9 +717,9 @@ remove your filters from the ipfs config file.
717
}
718
719
if req.Arguments[0] == "all" || req.Arguments[0] == "*" {
719
- fs := swrm.Filters.Filters()
720
+ fs := swrm.Filters.FiltersForAction(mafilter.ActionDeny)
721
for _, f := range fs {
721
- swrm.Filters.Remove(f)
722
+ swrm.Filters.RemoveLiteral(f)
723
}
724
725
removed, err := filtersRemoveAll(r, cfg)
@@ -730,12 +731,12 @@ remove your filters from the ipfs config file.
731
}
732
733
for _, arg := range req.Arguments {
733
- mask, err := mafilter.NewMask(arg)
734
+ mask, err := mamask.NewMask(arg)
735
if err != nil {
736
return err
737
}
738
738
- swrm.Filters.Remove(mask)
739
+ swrm.Filters.RemoveLiteral(*mask)
740
}
741
742
removed, err := filtersRemove(r, cfg, req.Arguments)
core/node/libp2p/addrs.go
+1
-1
@@ -39,7 +39,7 @@ func makeAddrsFactory(announce []string, noAnnounce []string) (p2pbhost.AddrsFac
39
for _, addr := range noAnnounce {
40
f, err := mamask.NewMask(addr)
41
if err == nil {
42
- filters.AddDialFilter(f)
42
+ filters.AddFilter(*f, mafilter.ActionDeny)
43
continue
44
}
45
maddr, err := ma.NewMultiaddr(addr)
namesys/resolve/pathresolver_test.go
+6
-6
@@ -16,17 +16,17 @@ func TestResolveNoComponents(t *testing.T) {
16
}
17
18
_, err = resolve.Resolve(n.Context(), n.Namesys, n.Resolver, path.Path("/ipns/"))
19
- if err != path.ErrNoComponents {
20
- t.Fatal("Should error with no components (/ipns/).", err)
19
+ if err.Error() != "invalid path \"/ipns/\": ipns path missing IPNS ID" {
20
+ t.Error("Should error with no components (/ipns/).", err)
21
}
22
23
_, err = resolve.Resolve(n.Context(), n.Namesys, n.Resolver, path.Path("/ipfs/"))
24
- if err != path.ErrNoComponents {
25
- t.Fatal("Should error with no components (/ipfs/).", err)
24
+ if err.Error() != "invalid path \"/ipfs/\": not enough path components" {
25
+ t.Error("Should error with no components (/ipfs/).", err)
26
}
27
28
_, err = resolve.Resolve(n.Context(), n.Namesys, n.Resolver, path.Path("/../.."))
29
- if err != path.ErrBadPath {
30
- t.Fatal("Should error with invalid path.", err)
29
+ if err.Error() != "invalid path \"/../..\": unknown namespace \"..\"" {
30
+ t.Error("Should error with invalid path.", err)
31
}
32
}
plugin/plugins/gen_main.sh
+1
-1
@@ -14,7 +14,7 @@ import (
14
$shortpkg "$pkg"
15
)
16
17
-var Plugins = $shortpkg.Plugins
17
+var Plugins = $shortpkg.Plugins //nolint
18
19
func main() {
20
panic("this is a plugin, build it as a plugin, this is here as for go#20312")