Skip to content

Commit b88bdfe

Browse files
aschmahmannaschmahmann
committed
chore: update go-multiaddr and go-multiaddr-net
1 parent 5f4cb4f commit b88bdfe

File tree

9 files changed

+23
-11
lines changed

9 files changed

+23
-11
lines changed

‎cmd/ipfs/daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
options "github.com/ipfs/interface-go-ipfs-core/options"
3535
goprocess "github.com/jbenet/goprocess"
3636
ma "github.com/multiformats/go-multiaddr"
37-
manet "github.com/multiformats/go-multiaddr-net"
37+
manet "github.com/multiformats/go-multiaddr/net"
3838
prometheus "github.com/prometheus/client_golang/prometheus"
3939
promauto "github.com/prometheus/client_golang/prometheus/promauto"
4040
)

‎cmd/ipfs/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
loggables "github.com/libp2p/go-libp2p-loggables"
3131
ma "github.com/multiformats/go-multiaddr"
3232
madns "github.com/multiformats/go-multiaddr-dns"
33-
manet "github.com/multiformats/go-multiaddr-net"
33+
manet "github.com/multiformats/go-multiaddr/net"
3434
)
3535

3636
// log is the command logger

‎core/commands/sysdiag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1010

1111
cmds "github.com/ipfs/go-ipfs-cmds"
12-
manet "github.com/multiformats/go-multiaddr-net"
12+
manet "github.com/multiformats/go-multiaddr/net"
1313
sysi "github.com/whyrusleeping/go-sysinfo"
1414
)
1515

‎core/corehttp/corehttp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/jbenet/goprocess"
1717
periodicproc "github.com/jbenet/goprocess/periodic"
1818
ma "github.com/multiformats/go-multiaddr"
19-
manet "github.com/multiformats/go-multiaddr-net"
19+
manet "github.com/multiformats/go-multiaddr/net"
2020
)
2121

2222
var log = logging.Logger("core/server")

‎go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/ipfs/go-bitswap v0.2.19
1919
github.com/ipfs/go-block-format v0.0.2
2020
github.com/ipfs/go-blockservice v0.1.3
21-
github.com/ipfs/go-cid v0.0.6
21+
github.com/ipfs/go-cid v0.0.7
2222
github.com/ipfs/go-cidutil v0.0.2
2323
github.com/ipfs/go-datastore v0.4.4
2424
github.com/ipfs/go-detect-race v0.0.1
@@ -90,11 +90,10 @@ require (
9090
github.com/miekg/dns v1.1.29 // indirect
9191
github.com/mitchellh/go-homedir v1.1.0
9292
github.com/mr-tron/base58 v1.1.3
93-
github.com/multiformats/go-multiaddr v0.2.2
93+
github.com/multiformats/go-multiaddr v0.3.1
9494
github.com/multiformats/go-multiaddr-dns v0.2.0
95-
github.com/multiformats/go-multiaddr-net v0.1.5
9695
github.com/multiformats/go-multibase v0.0.3
97-
github.com/multiformats/go-multihash v0.0.13
96+
github.com/multiformats/go-multihash v0.0.14
9897
github.com/opentracing/opentracing-go v1.1.0
9998
github.com/pkg/errors v0.9.1
10099
github.com/prometheus/client_golang v1.6.0

‎go.sum

+13
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ github.com/ipfs/go-cid v0.0.5 h1:o0Ix8e/ql7Zb5UVUJEUfjsWCIY8t48++9lR8qi6oiJU=
287287
github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
288288
github.com/ipfs/go-cid v0.0.6 h1:go0y+GcDOGeJIV01FeBsta4FHngoA4Wz7KMeLkXAhMs=
289289
github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
290+
github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
291+
github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
290292
github.com/ipfs/go-cidutil v0.0.2 h1:CNOboQf1t7Qp0nuNh8QMmhJs0+Q//bRL1axtCnIB1Yo=
291293
github.com/ipfs/go-cidutil v0.0.2/go.mod h1:ewllrvrxG6AMYStla3GD7Cqn+XYSLqjK0vc+086tB6s=
292294
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
@@ -778,6 +780,7 @@ github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9
778780
github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
779781
github.com/libp2p/go-maddr-filter v0.0.5 h1:CW3AgbMO6vUvT4kf87y4N+0P8KUl2aqLYhrGyDUbLSg=
780782
github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
783+
github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
781784
github.com/libp2p/go-mplex v0.0.1/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
782785
github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
783786
github.com/libp2p/go-mplex v0.0.4/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
@@ -931,6 +934,10 @@ github.com/multiformats/go-multiaddr v0.2.1 h1:SgG/cw5vqyB5QQe5FPe2TqggU9WtrA9X4
931934
github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
932935
github.com/multiformats/go-multiaddr v0.2.2 h1:XZLDTszBIJe6m0zF6ITBrEcZR73OPUhCBBS9rYAuUzI=
933936
github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
937+
github.com/multiformats/go-multiaddr v0.3.0 h1:z1Old9IYcUyMEtSbvwCOJ1jcrmJdU0LYH8aFBvZKzcQ=
938+
github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
939+
github.com/multiformats/go-multiaddr v0.3.1 h1:1bxa+W7j9wZKTZREySx1vPMs2TqrYWjVZ7zE6/XLG1I=
940+
github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
934941
github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
935942
github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
936943
github.com/multiformats/go-multiaddr-dns v0.2.0 h1:YWJoIDwLePniH7OU5hBnDZV6SWuvJqJ0YtN6pLeH9zA=
@@ -951,6 +958,8 @@ github.com/multiformats/go-multiaddr-net v0.1.4 h1:g6gwydsfADqFvrHoMkS0n9Ok9CG6F
951958
github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
952959
github.com/multiformats/go-multiaddr-net v0.1.5 h1:QoRKvu0xHN1FCFJcMQLbG/yQE2z441L5urvG3+qyz7g=
953960
github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
961+
github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
962+
github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
954963
github.com/multiformats/go-multibase v0.0.1 h1:PN9/v21eLywrFWdFNsFKaU04kLJzuYzmrJR+ubhT9qA=
955964
github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
956965
github.com/multiformats/go-multibase v0.0.2 h1:2pAgScmS1g9XjH7EtAfNhTuyrWYEWcxy0G5Wo85hWDA=
@@ -968,6 +977,8 @@ github.com/multiformats/go-multihash v0.0.10 h1:lMoNbh2Ssd9PUF74Nz008KGzGPlfeV6w
968977
github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
969978
github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
970979
github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
980+
github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
981+
github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
971982
github.com/multiformats/go-multistream v0.0.1/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
972983
github.com/multiformats/go-multistream v0.0.4/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
973984
github.com/multiformats/go-multistream v0.1.0 h1:UpO6jrsjqs46mqAK3n6wKRYFhugss9ArzbyUzU+4wkQ=
@@ -979,6 +990,8 @@ github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXS
979990
github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
980991
github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
981992
github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
993+
github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
994+
github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
982995
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
983996
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
984997
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=

‎p2p/local.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/libp2p/go-libp2p-core/peer"
1010
"github.com/libp2p/go-libp2p-core/protocol"
1111
ma "github.com/multiformats/go-multiaddr"
12-
"github.com/multiformats/go-multiaddr-net"
12+
"github.com/multiformats/go-multiaddr/net"
1313
)
1414

1515
// localListener manet streams and proxies them to libp2p services

‎p2p/remote.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
net "github.com/libp2p/go-libp2p-core/network"
88
protocol "github.com/libp2p/go-libp2p-core/protocol"
99
ma "github.com/multiformats/go-multiaddr"
10-
manet "github.com/multiformats/go-multiaddr-net"
10+
manet "github.com/multiformats/go-multiaddr/net"
1111
)
1212

1313
var maPrefix = "/" + ma.ProtocolWithCode(ma.P_IPFS).Name + "/"

‎p2p/stream.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
peer "github.com/libp2p/go-libp2p-core/peer"
1010
protocol "github.com/libp2p/go-libp2p-core/protocol"
1111
ma "github.com/multiformats/go-multiaddr"
12-
manet "github.com/multiformats/go-multiaddr-net"
12+
manet "github.com/multiformats/go-multiaddr/net"
1313
)
1414

1515
const cmgrTag = "stream-fwd"

0 commit comments

Comments
 (0)