From 940e23124a3506382f21c3d76f6e4fe38afbd636 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 25 Jul 2021 11:29:40 +0200 Subject: [PATCH] remove forced dependency on deprecated go-maddr-filter --- go.mod | 1 - go.sum | 3 --- internal/codependencies/README.md | 14 -------------- internal/codependencies/codependencies.go | 8 -------- 4 files changed, 26 deletions(-) delete mode 100644 internal/codependencies/README.md delete mode 100644 internal/codependencies/codependencies.go diff --git a/go.mod b/go.mod index 471deb4..8b94ec3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.15 require ( github.com/ipfs/go-cid v0.0.7 - github.com/libp2p/go-maddr-filter v0.1.0 github.com/multiformats/go-multihash v0.0.14 github.com/multiformats/go-varint v0.0.6 ) diff --git a/go.sum b/go.sum index 402f52e..53b95ca 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY= github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I= -github.com/libp2p/go-maddr-filter v0.1.0 h1:4ACqZKw8AqiuJfwFGq1CYDFugfXTOos+qQ3DETkhtCE= -github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo= @@ -13,7 +11,6 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= -github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y= github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= diff --git a/internal/codependencies/README.md b/internal/codependencies/README.md deleted file mode 100644 index a59c118..0000000 --- a/internal/codependencies/README.md +++ /dev/null @@ -1,14 +0,0 @@ -This package allows us to depend on other modules, to _force_ these other -modules to upgrade to some minimum version. This allows us to express "co -dependency" requirements in cases where this module doesn't strictly speaking -_depend_ on another module, but conflicts with some version of that module. -We are using this here to depend on deprecated modules that have been -merged into this package. - -In practice, this means: - -1. Packages imported here _will not_ end up in the final binary as nothing - imports this package. -2. Modules containing these packages will, unfortunately, be downloaded as - "dependencies" of this package. -3. Anyone using this module will be forced to upgrade all co-dependencies. diff --git a/internal/codependencies/codependencies.go b/internal/codependencies/codependencies.go deleted file mode 100644 index be21527..0000000 --- a/internal/codependencies/codependencies.go +++ /dev/null @@ -1,8 +0,0 @@ -package codependencies - -import ( - // Packages imported into this package. - - // go-maddr-filter < 0.1.0 conflicts with this package. - _ "github.com/libp2p/go-maddr-filter" -)