chore: update deps
And remove use of mafilter library (now rolled into go-multiaddr).
Steven Allen committed
May 20, 2020 at 17:51 UTC
0a8b2f117bee175468bfa036c278d79ea286c844
3 files changed
+11
-13
core/node/libp2p/addrs.go
+2
-3
@@ -6,7 +6,6 @@ import (
6
"github.com/libp2p/go-libp2p"
7
host "github.com/libp2p/go-libp2p-core/host"
8
p2pbhost "github.com/libp2p/go-libp2p/p2p/host/basic"
9
- mafilter "github.com/libp2p/go-maddr-filter"
9
ma "github.com/multiformats/go-multiaddr"
10
mamask "github.com/whyrusleeping/multiaddr-filter"
11
)
@@ -36,12 +35,12 @@ func makeAddrsFactory(announce []string, noAnnounce []string) (p2pbhost.AddrsFac
35
annAddrs = append(annAddrs, maddr)
36
}
37
39
- filters := mafilter.NewFilters()
38
+ filters := ma.NewFilters()
39
noAnnAddrs := map[string]bool{}
40
for _, addr := range noAnnounce {
41
f, err := mamask.NewMask(addr)
42
if err == nil {
44
- filters.AddFilter(*f, mafilter.ActionDeny)
43
+ filters.AddFilter(*f, ma.ActionDeny)
44
continue
45
}
46
maddr, err := ma.NewMultiaddr(addr)
go.mod
+3
-4
@@ -15,7 +15,7 @@ require (
15
github.com/gogo/protobuf v1.3.1
16
github.com/hashicorp/go-multierror v1.1.0
17
github.com/hashicorp/golang-lru v0.5.4
18
- github.com/ipfs/go-bitswap v0.2.14
18
+ github.com/ipfs/go-bitswap v0.2.15
19
github.com/ipfs/go-block-format v0.0.2
20
github.com/ipfs/go-blockservice v0.1.3
21
github.com/ipfs/go-cid v0.0.5
@@ -50,13 +50,13 @@ require (
50
github.com/ipfs/go-merkledag v0.3.2
51
github.com/ipfs/go-metrics-interface v0.0.1
52
github.com/ipfs/go-metrics-prometheus v0.0.2
53
- github.com/ipfs/go-mfs v0.1.1
53
+ github.com/ipfs/go-mfs v0.1.2
54
github.com/ipfs/go-path v0.0.7
55
github.com/ipfs/go-unixfs v0.2.4
56
github.com/ipfs/go-verifcid v0.0.1
57
github.com/ipfs/interface-go-ipfs-core v0.3.0
58
github.com/ipld/go-car v0.1.0
59
- github.com/jbenet/go-is-domain v1.0.3
59
+ github.com/jbenet/go-is-domain v1.0.5
60
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
61
github.com/jbenet/go-temp-err-catcher v0.1.0
62
github.com/jbenet/goprocess v0.1.4
@@ -81,7 +81,6 @@ require (
81
github.com/libp2p/go-libp2p-testing v0.1.1
82
github.com/libp2p/go-libp2p-tls v0.1.3
83
github.com/libp2p/go-libp2p-yamux v0.2.7
84
- github.com/libp2p/go-maddr-filter v0.0.5
84
github.com/libp2p/go-socket-activation v0.0.2
85
github.com/mattn/go-runewidth v0.0.8 // indirect
86
github.com/miekg/dns v1.1.29 // indirect
go.sum
+6
-6
@@ -222,8 +222,8 @@ github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSA
222
github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs=
223
github.com/ipfs/go-bitswap v0.1.3/go.mod h1:YEQlFy0kkxops5Vy+OxWdRSEZIoS7I7KDIwoa5Chkps=
224
github.com/ipfs/go-bitswap v0.1.8/go.mod h1:TOWoxllhccevbWFUR2N7B1MTSVVge1s6XSMiCSA4MzM=
225
-github.com/ipfs/go-bitswap v0.2.14 h1:qAtuiL7q4T/CD1gM4UP9IjzuNABoYC1/GS76ZV7fw88=
226
-github.com/ipfs/go-bitswap v0.2.14/go.mod h1:IsK9Yb5iLUqGXxycARAH9f/QVVvsZLQCPIYMlKgzbL0=
225
+github.com/ipfs/go-bitswap v0.2.15 h1:cUOwiNmlih4W6M04pI9QBZRMWxANWhmAz5c3nwu2SYI=
226
+github.com/ipfs/go-bitswap v0.2.15/go.mod h1:IsK9Yb5iLUqGXxycARAH9f/QVVvsZLQCPIYMlKgzbL0=
227
github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
228
github.com/ipfs/go-block-format v0.0.2 h1:qPDvcP19izTjU8rgo6p7gTXZlkMkF5bz5G3fqIsSCPE=
229
github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
@@ -385,8 +385,8 @@ github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fG
385
github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
386
github.com/ipfs/go-metrics-prometheus v0.0.2 h1:9i2iljLg12S78OhC6UAiXi176xvQGiZaGVF1CUVdE+s=
387
github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
388
-github.com/ipfs/go-mfs v0.1.1 h1:tjYEWFIl0W6vRFuM/EnySHaaYzPmDcQWwTjtYWMGQ1A=
389
-github.com/ipfs/go-mfs v0.1.1/go.mod h1:nk17h6kCOrfaNqXvx2VJ3SqkJ0VYUzJFAsc+BA0sqaw=
388
+github.com/ipfs/go-mfs v0.1.2 h1:DlelNSmH+yz/Riy0RjPKlooPg0KML4lXGdLw7uZkfAg=
389
+github.com/ipfs/go-mfs v0.1.2/go.mod h1:T1QBiZPEpkPLzDqEJLNnbK55BVKVlNi2a+gVm4diFo0=
390
github.com/ipfs/go-path v0.0.3/go.mod h1:zIRQUez3LuQIU25zFjC2hpBTHimWx7VK5bjZgRLbbdo=
391
github.com/ipfs/go-path v0.0.7 h1:H06hKMquQ0aYtHiHryOMLpQC1qC3QwXwkahcEVD51Ho=
392
github.com/ipfs/go-path v0.0.7/go.mod h1:6KTKmeRnBXgqrTvzFrPV3CamxcgvXX/4z79tfAd2Sno=
@@ -420,8 +420,8 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+
420
github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
421
github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
422
github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
423
-github.com/jbenet/go-is-domain v1.0.3 h1:FuRBJ0h79p00eseyaLckJT5KnE8RyqI+HLopvNSyNE0=
424
-github.com/jbenet/go-is-domain v1.0.3/go.mod h1:xbRLRb0S7FgzDBTJlguhDVwLYM/5yNtvktxj2Ttfy7Q=
423
+github.com/jbenet/go-is-domain v1.0.5 h1:r92uiHbMEJo9Fkey5pMBtZAzjPQWic0ieo7Jw1jEuQQ=
424
+github.com/jbenet/go-is-domain v1.0.5/go.mod h1:xbRLRb0S7FgzDBTJlguhDVwLYM/5yNtvktxj2Ttfy7Q=
425
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c h1:uUx61FiAa1GI6ZmVd2wf2vULeQZIKG66eybjNXKYCz4=
426
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod h1:sdx1xVM9UuLw1tXnhJWN3piypTUO3vCIHYmG15KE/dU=
427
github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2 h1:vhC1OXXiT9R2pczegwz6moDvuRpggaroAXhPIseh57A=