From ceb65f1ada444995cdc48bde9308c9e9b3929c74 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 18 Aug 2022 15:53:06 +0300 Subject: [PATCH] deprecate this repo --- README.md | 5 + codecov.yml | 5 - go.mod | 70 +-- go.sum | 793 +++++++++++++++++++++++-- metrics.go | 55 +- metrics_test.go | 63 -- pb/Makefile | 12 - pb/custom.go | 110 ---- pb/pstore.pb.go | 1027 --------------------------------- pb/pstore.proto | 40 -- pb/pstorepb_test.go | 183 ------ peerstore.go | 20 +- pstoreds/addr_book.go | 600 +------------------ pstoreds/addr_book_gc.go | 410 ------------- pstoreds/addr_book_gc_test.go | 264 --------- pstoreds/cache.go | 40 -- pstoreds/cyclic_batch.go | 78 --- pstoreds/ds_test.go | 175 ------ pstoreds/keybook.go | 133 +---- pstoreds/metadata.go | 71 +-- pstoreds/peerstore.go | 176 +----- pstoreds/protobook.go | 196 +------ pstoremem/addr_book.go | 507 +--------------- pstoremem/inmem_test.go | 84 --- pstoremem/keybook.go | 97 +--- pstoremem/metadata.go | 53 +- pstoremem/peerstore.go | 113 +--- pstoremem/protobook.go | 191 +----- pstoremem/sorting.go | 50 -- pstoremem/sorting_test.go | 20 - test/addr_book_suite.go | 506 ---------------- test/benchmarks_suite.go | 124 ---- test/keybook_suite.go | 338 ----------- test/peerstore_suite.go | 402 ------------- test/utils.go | 96 --- 35 files changed, 875 insertions(+), 6232 deletions(-) delete mode 100644 codecov.yml delete mode 100644 metrics_test.go delete mode 100644 pb/Makefile delete mode 100644 pb/custom.go delete mode 100644 pb/pstore.pb.go delete mode 100644 pb/pstore.proto delete mode 100644 pb/pstorepb_test.go delete mode 100644 pstoreds/addr_book_gc.go delete mode 100644 pstoreds/addr_book_gc_test.go delete mode 100644 pstoreds/cache.go delete mode 100644 pstoreds/cyclic_batch.go delete mode 100644 pstoreds/ds_test.go delete mode 100644 pstoremem/inmem_test.go delete mode 100644 pstoremem/sorting.go delete mode 100644 pstoremem/sorting_test.go delete mode 100644 test/addr_book_suite.go delete mode 100644 test/benchmarks_suite.go delete mode 100644 test/keybook_suite.go delete mode 100644 test/peerstore_suite.go delete mode 100644 test/utils.go diff --git a/README.md b/README.md index 0ad7cf9..8710376 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +# DEPRECATION NOTICE + +This package has moved into go-libp2p as a sub-package, `github.com/libp2p/go-libp2p/p2p/host/peerstore`. + + # go-libp2p-peerstore [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai) [![](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](https://libp2p.io/) diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index 96dcfd7..0000000 --- a/codecov.yml +++ /dev/null @@ -1,5 +0,0 @@ -coverage: - range: "50...100" -comment: off -ignore: - - "pb/*.pb.go" \ No newline at end of file diff --git a/go.mod b/go.mod index 8ebd97e..7a2cbee 100644 --- a/go.mod +++ b/go.mod @@ -5,56 +5,40 @@ go 1.17 retract v0.2.9 // Contains backwards-incompatible changes. Use v0.3.0 instead. require ( - github.com/benbjohnson/clock v1.3.0 - github.com/gogo/protobuf v1.3.2 - github.com/hashicorp/golang-lru v0.5.4 - github.com/ipfs/go-datastore v0.5.0 - github.com/ipfs/go-ds-badger v0.3.0 - github.com/ipfs/go-ds-leveldb v0.5.0 - github.com/ipfs/go-log/v2 v2.3.0 - github.com/libp2p/go-buffer-pool v0.0.2 - github.com/libp2p/go-libp2p-core v0.12.0 - github.com/multiformats/go-base32 v0.0.3 - github.com/multiformats/go-multiaddr v0.3.3 - github.com/multiformats/go-multiaddr-fmt v0.1.0 - github.com/stretchr/testify v1.7.0 - go.uber.org/goleak v1.1.10 + github.com/ipfs/go-datastore v0.5.1 + github.com/libp2p/go-libp2p v0.22.0 ) require ( - github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect - github.com/btcsuite/btcd v0.20.1-beta // indirect - github.com/cespare/xxhash v1.1.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dgraph-io/badger v1.6.2 // indirect - github.com/dgraph-io/ristretto v0.0.2 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect - github.com/golang/protobuf v1.3.1 // indirect - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect - github.com/google/uuid v1.1.1 // indirect - github.com/ipfs/go-cid v0.0.7 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/ipfs/go-cid v0.2.0 // indirect + github.com/ipfs/go-log/v2 v2.5.1 // indirect github.com/jbenet/goprocess v0.1.4 // indirect - github.com/libp2p/go-openssl v0.0.7 // indirect - github.com/mattn/go-isatty v0.0.13 // indirect - github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect - github.com/minio/sha256-simd v0.1.1 // indirect + github.com/klauspost/cpuid/v2 v2.1.0 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/libp2p/go-openssl v0.1.0 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-pointer v0.0.1 // indirect + github.com/minio/sha256-simd v1.0.0 // indirect github.com/mr-tron/base58 v1.2.0 // indirect + github.com/multiformats/go-base32 v0.0.4 // indirect github.com/multiformats/go-base36 v0.1.0 // indirect - github.com/multiformats/go-multibase v0.0.3 // indirect - github.com/multiformats/go-multihash v0.0.14 // indirect + github.com/multiformats/go-multiaddr v0.6.0 // indirect + github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect + github.com/multiformats/go-multibase v0.1.1 // indirect + github.com/multiformats/go-multicodec v0.5.0 // indirect + github.com/multiformats/go-multihash v0.2.1 // indirect github.com/multiformats/go-varint v0.0.6 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/syndtr/goleveldb v1.0.0 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.16.0 // indirect - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect - golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect - golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect - golang.org/x/tools v0.1.1 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/multierr v1.8.0 // indirect + go.uber.org/zap v1.22.0 // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + lukechampine.com/blake3 v1.1.7 // indirect ) diff --git a/go.sum b/go.sum index 68ca238..6b15002 100644 --- a/go.sum +++ b/go.sum @@ -1,63 +1,249 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= +github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= +github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= +github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= +github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= +github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= +github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= +github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8= github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE= github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po= github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= +github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM= +github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= +github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -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/ipfs/go-datastore v0.5.0 h1:rQicVCEacWyk4JZ6G5bD9TKR7lZEG1MWcG7UdWYrFAU= +github.com/ipfs/go-cid v0.2.0 h1:01JTiihFq9en9Vz0lc0VDWvZe/uBonGpzo4THP0vcQ0= +github.com/ipfs/go-cid v0.2.0/go.mod h1:P+HXFDF4CVhaVayiEb4wkAy7zBHxBwsJyt0Y5U6MLro= github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk= +github.com/ipfs/go-datastore v0.5.1 h1:WkRhLuISI+XPD0uk3OskB0fYFSyqK8Ob5ZYew9Qa1nQ= +github.com/ipfs/go-datastore v0.5.1/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= github.com/ipfs/go-ds-badger v0.3.0 h1:xREL3V0EH9S219kFFueOYJJTcjgNSZ2HY1iSvN7U1Ro= @@ -65,79 +251,231 @@ github.com/ipfs/go-ds-badger v0.3.0/go.mod h1:1ke6mXNqeV8K3y5Ak2bAA0osoTfmxUdupV github.com/ipfs/go-ds-leveldb v0.5.0 h1:s++MEBbD3ZKc9/8/njrn4flZLnCuY9I79v94gBUNumo= github.com/ipfs/go-ds-leveldb v0.5.0/go.mod h1:d3XG9RUDzQ6V4SHi8+Xgj9j1XuEk1z82lquxrVbml/Q= github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw= +github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ= github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw= -github.com/ipfs/go-log/v2 v2.3.0 h1:31Re/cPqFHpsRHgyVwjWADPoF0otB1WrjTy8ZFYwEZU= -github.com/ipfs/go-log/v2 v2.3.0/go.mod h1:QqGoj30OTpnKaG/LKTGTxoP2mmQtjVMEnK72gynbe/g= +github.com/ipfs/go-log/v2 v2.5.0/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI= +github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY= +github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI= +github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA= +github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk= github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o= github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4= +github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= +github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0= +github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= +github.com/koron/go-ssdp v0.0.3/go.mod h1:b2MxI6yh02pKrsyNoQUsk4+YNikaGhe4894J+Q5lDvA= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= +github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic= github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs= -github.com/libp2p/go-libp2p-core v0.12.0 h1:S9bO2lhSJtOvAKo8QAdW9Zp1FEo0XkfXymqvrW6l/I8= -github.com/libp2p/go-libp2p-core v0.12.0/go.mod h1:ECdxehoYosLYHgDDFa2N4yE8Y7aQRAMf0sX9mf2sbGg= -github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU= +github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro= +github.com/libp2p/go-libp2p v0.22.0 h1:2Tce0kHOp5zASFKJbNzRElvh0iZwdtG5uZheNW8chIw= +github.com/libp2p/go-libp2p v0.22.0/go.mod h1:UDolmweypBSjQb2f7xutPnwZ/fxioLbMBxSjRksxxU4= +github.com/libp2p/go-libp2p-asn-util v0.2.0/go.mod h1:WoaWxbHKBymSN41hWSq/lGKJEca7TNm58+gGJi2WsLI= +github.com/libp2p/go-libp2p-core v0.19.0/go.mod h1:AkA+FUKQfYt1FLNef5fOPlo/naAWjKy/RCjkcPjqzYg= +github.com/libp2p/go-libp2p-testing v0.11.0/go.mod h1:qG4sF27dfKFoK9KlVzK2y52LQKhp0VEmLjV5aDqr1Hg= +github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU= github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA= -github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw= +github.com/libp2p/go-msgio v0.2.0/go.mod h1:dBVM1gW3Jk9XqHkU4eKdGvVHdLa51hoGfll6jMJMSlY= +github.com/libp2p/go-nat v0.1.0/go.mod h1:X7teVkwRHNInVNWQiO/tAiAVRwSr5zoRz4YSTC3uRBM= +github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk= +github.com/libp2p/go-netroute v0.2.0/go.mod h1:Vio7LTzZ+6hoT4CMZi5/6CpY3Snzh2vgZhWgxMNwlQI= github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc= +github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo= +github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6gNdOBQMtc= +github.com/libp2p/go-reuseport v0.2.0/go.mod h1:bvVho6eLMm6Bz5hmU0LYN3ixd3nPPvtIlaURZZgOY4k= +github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k= +github.com/libp2p/go-yamux/v3 v3.1.2/go.mod h1:jeLEQgLXqE2YqX1ilAClIfCMDY+0uXQUKmmb/qp0gT4= +github.com/libp2p/zeroconf/v2 v2.2.0/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs= +github.com/lucas-clemente/quic-go v0.28.1/go.mod h1:oGz5DKK41cJt5+773+BSO9BXDsREY4HLf7+0odGAPO0= +github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA= -github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= +github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= +github.com/marten-seemann/qtls-go1-17 v0.1.2/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= +github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= +github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= +github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= +github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0= +github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= +github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= +github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms= +github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b/go.mod h1:lxPUiZwKoFL8DUUmalo2yJJUCxbPKtm8OKfqr2/FTNU= +github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4SxOuR/czcZ/E2RSJ3sfHs8FpHhQ5CWMf9s= 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/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= -github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= -github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= +github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= +github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= -github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= +github.com/multiformats/go-base32 v0.0.4 h1:+qMh4a2f37b4xTNs6mqitDinryCI+tfO2dRVMN9mjSE= +github.com/multiformats/go-base32 v0.0.4/go.mod h1:jNLFzjPZtp3aIARHbJRZIaPuspdH0J6q39uUM5pnABM= 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.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo= -github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y= -github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs= -github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0= +github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4= +github.com/multiformats/go-multiaddr v0.4.1/go.mod h1:3afI9HfVW8csiF8UZqtpYRiDyew8pRX7qLIGHu9FLuM= +github.com/multiformats/go-multiaddr v0.6.0 h1:qMnoOPj2s8xxPU5kZ57Cqdr0hHhARz7mFsPMIiYNqzg= +github.com/multiformats/go-multiaddr v0.6.0/go.mod h1:F4IpaKZuPP360tOMn2Tpyu0At8w23aRyVqeK0DbFeGM= +github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk= github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E= github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo= -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-multibase v0.1.1 h1:3ASCDsuLX8+j4kx58qnJ4YFq/JWTJpCyDW27ztsVTOI= +github.com/multiformats/go-multibase v0.1.1/go.mod h1:ZEjHE+IsUrgp5mhlEAYjMtZwK1k4haNkcaPg9aoe1a8= +github.com/multiformats/go-multicodec v0.4.1/go.mod h1:1Hj/eHRaVWSXiSNNfcEPcwZleTmdNP81xlxDLnWU9GQ= +github.com/multiformats/go-multicodec v0.5.0 h1:EgU6cBe/D7WRwQb1KmnBvU7lrcFGMggZVTPtOW9dDHs= +github.com/multiformats/go-multicodec v0.5.0/go.mod h1:DiY2HFaEp5EhEXb/iYzVAunmyX/aSFMxq2KMKfWEues= github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I= github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= +github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg= +github.com/multiformats/go-multihash v0.2.1 h1:aem8ZT0VA2nCHHk7bPJ1BjUbHNciqZC/d16Vve9l108= +github.com/multiformats/go-multihash v0.2.1/go.mod h1:WxoMcYG85AZVQUyRyo9s4wULvW5qrI9vb2Lt6evduFc= +github.com/multiformats/go-multistream v0.3.3/go.mod h1:ODRoqamLUsETKS9BNcII4gcRsJBU5VAwRIv7O39cEXg= +github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -150,103 +488,450 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= +go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= +go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= +golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= +lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0= +lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/metrics.go b/metrics.go index 87a9410..263afb6 100644 --- a/metrics.go +++ b/metrics.go @@ -1,58 +1,25 @@ package peerstore import ( - "sync" "time" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/p2p/host/peerstore" ) // LatencyEWMASmoothing governs the decay of the EWMA (the speed // at which it changes). This must be a normalized (0-1) value. // 1 is 100% change, 0 is no change. -var LatencyEWMASmoothing = 0.1 +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore.LatencyEWMASmoothing instead +var LatencyEWMASmoothing = peerstore.LatencyEWMASmoothing -type metrics struct { - mutex sync.RWMutex - latmap map[peer.ID]time.Duration +type metrics interface { + RecordLatency(peer.ID, time.Duration) + LatencyEWMA(peer.ID) time.Duration + RemovePeer(p peer.ID) } -func NewMetrics() *metrics { - return &metrics{ - latmap: make(map[peer.ID]time.Duration), - } -} - -// RecordLatency records a new latency measurement -func (m *metrics) RecordLatency(p peer.ID, next time.Duration) { - nextf := float64(next) - s := LatencyEWMASmoothing - if s > 1 || s < 0 { - s = 0.1 // ignore the knob. it's broken. look, it jiggles. - } - - m.mutex.Lock() - ewma, found := m.latmap[p] - ewmaf := float64(ewma) - if !found { - m.latmap[p] = next // when no data, just take it as the mean. - } else { - nextf = ((1.0 - s) * ewmaf) + (s * nextf) - m.latmap[p] = time.Duration(nextf) - } - m.mutex.Unlock() -} - -// LatencyEWMA returns an exponentially-weighted moving avg. -// of all measurements of a peer's latency. -func (m *metrics) LatencyEWMA(p peer.ID) time.Duration { - m.mutex.RLock() - defer m.mutex.RUnlock() - return m.latmap[p] -} - -func (m *metrics) RemovePeer(p peer.ID) { - m.mutex.Lock() - delete(m.latmap, p) - m.mutex.Unlock() +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore.NewMetrics instead +func NewMetrics() metrics { + return peerstore.NewMetrics() } diff --git a/metrics_test.go b/metrics_test.go deleted file mode 100644 index 723baad..0000000 --- a/metrics_test.go +++ /dev/null @@ -1,63 +0,0 @@ -package peerstore - -import ( - "fmt" - "math/rand" - "testing" - "time" - - "github.com/libp2p/go-libp2p-core/test" -) - -func TestLatencyEWMAFun(t *testing.T) { - t.Skip("run it for fun") - - m := NewMetrics() - id, err := test.RandPeerID() - if err != nil { - t.Fatal(err) - } - - mu := 100.0 - sig := 10.0 - next := func() time.Duration { - mu = (rand.NormFloat64() * sig) + mu - return time.Duration(mu) - } - - print := func() { - fmt.Printf("%3.f %3.f --> %d\n", sig, mu, m.LatencyEWMA(id)) - } - - for { - time.Sleep(200 * time.Millisecond) - m.RecordLatency(id, next()) - print() - } -} - -func TestLatencyEWMA(t *testing.T) { - m := NewMetrics() - id, err := test.RandPeerID() - if err != nil { - t.Fatal(err) - } - - const exp = 100 - const mu = exp - const sig = 10 - next := func() time.Duration { return time.Duration(rand.Intn(20) - 10 + mu) } - - for i := 0; i < 10; i++ { - m.RecordLatency(id, next()) - } - - lat := m.LatencyEWMA(id) - diff := exp - lat - if diff < 0 { - diff = -diff - } - if diff > sig { - t.Fatalf("latency outside of expected range. expected %d ± %d, got %d", exp, sig, lat) - } -} diff --git a/pb/Makefile b/pb/Makefile deleted file mode 100644 index 51e71f8..0000000 --- a/pb/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -PB = $(wildcard *.proto) -GO = $(PB:.proto=.pb.go) - -all: $(GO) - -%.pb.go: %.proto - protoc --proto_path=$(GOPATH)/src:. --gogofaster_out=. $< - -clean: - rm -f *.pb.go - -.PHONY: clean \ No newline at end of file diff --git a/pb/custom.go b/pb/custom.go deleted file mode 100644 index 41784a4..0000000 --- a/pb/custom.go +++ /dev/null @@ -1,110 +0,0 @@ -package pstore_pb - -import ( - "encoding/json" - - proto "github.com/gogo/protobuf/proto" - peer "github.com/libp2p/go-libp2p-core/peer" - pt "github.com/libp2p/go-libp2p-core/test" - ma "github.com/multiformats/go-multiaddr" -) - -// customGogoType aggregates the interfaces that custom Gogo types need to implement. -// it is only used for type assertions. -type customGogoType interface { - proto.Marshaler - proto.Unmarshaler - json.Marshaler - json.Unmarshaler - proto.Sizer -} - -// ProtoAddr is a custom type used by gogo to serde raw peer IDs into the peer.ID type, and back. -type ProtoPeerID struct { - peer.ID -} - -var _ customGogoType = (*ProtoPeerID)(nil) - -func (id ProtoPeerID) Marshal() ([]byte, error) { - return []byte(id.ID), nil -} - -func (id ProtoPeerID) MarshalTo(data []byte) (n int, err error) { - return copy(data, []byte(id.ID)), nil -} - -func (id ProtoPeerID) MarshalJSON() ([]byte, error) { - m, _ := id.Marshal() - return json.Marshal(m) -} - -func (id *ProtoPeerID) Unmarshal(data []byte) (err error) { - id.ID = peer.ID(string(data)) - return nil -} - -func (id *ProtoPeerID) UnmarshalJSON(data []byte) error { - var v []byte - err := json.Unmarshal(data, &v) - if err != nil { - return err - } - return id.Unmarshal(v) -} - -func (id ProtoPeerID) Size() int { - return len([]byte(id.ID)) -} - -// ProtoAddr is a custom type used by gogo to serde raw multiaddresses into the ma.Multiaddr type, and back. -type ProtoAddr struct { - ma.Multiaddr -} - -var _ customGogoType = (*ProtoAddr)(nil) - -func (a ProtoAddr) Marshal() ([]byte, error) { - return a.Bytes(), nil -} - -func (a ProtoAddr) MarshalTo(data []byte) (n int, err error) { - return copy(data, a.Bytes()), nil -} - -func (a ProtoAddr) MarshalJSON() ([]byte, error) { - m, _ := a.Marshal() - return json.Marshal(m) -} - -func (a *ProtoAddr) Unmarshal(data []byte) (err error) { - a.Multiaddr, err = ma.NewMultiaddrBytes(data) - return err -} - -func (a *ProtoAddr) UnmarshalJSON(data []byte) error { - v := new([]byte) - err := json.Unmarshal(data, v) - if err != nil { - return err - } - return a.Unmarshal(*v) -} - -func (a ProtoAddr) Size() int { - return len(a.Bytes()) -} - -// NewPopulatedProtoAddr generates a populated instance of the custom gogo type ProtoAddr. -// It is required by gogo-generated tests. -func NewPopulatedProtoAddr(r randyPstore) *ProtoAddr { - a, _ := ma.NewMultiaddr("/ip4/123.123.123.123/tcp/7001") - return &ProtoAddr{Multiaddr: a} -} - -// NewPopulatedProtoPeerID generates a populated instance of the custom gogo type ProtoPeerID. -// It is required by gogo-generated tests. -func NewPopulatedProtoPeerID(r randyPstore) *ProtoPeerID { - id, _ := pt.RandPeerID() - return &ProtoPeerID{ID: id} -} diff --git a/pb/pstore.pb.go b/pb/pstore.pb.go deleted file mode 100644 index e9d7dfd..0000000 --- a/pb/pstore.pb.go +++ /dev/null @@ -1,1027 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pstore.proto - -package pstore_pb - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// AddrBookRecord represents a record for a peer in the address book. -type AddrBookRecord struct { - // The peer ID. - Id *ProtoPeerID `protobuf:"bytes,1,opt,name=id,proto3,customtype=ProtoPeerID" json:"id,omitempty"` - // The multiaddresses. This is a sorted list where element 0 expires the soonest. - Addrs []*AddrBookRecord_AddrEntry `protobuf:"bytes,2,rep,name=addrs,proto3" json:"addrs,omitempty"` - // The most recently received signed PeerRecord. - CertifiedRecord *AddrBookRecord_CertifiedRecord `protobuf:"bytes,3,opt,name=certified_record,json=certifiedRecord,proto3" json:"certified_record,omitempty"` -} - -func (m *AddrBookRecord) Reset() { *m = AddrBookRecord{} } -func (m *AddrBookRecord) String() string { return proto.CompactTextString(m) } -func (*AddrBookRecord) ProtoMessage() {} -func (*AddrBookRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_f96873690e08a98f, []int{0} -} -func (m *AddrBookRecord) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AddrBookRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AddrBookRecord.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AddrBookRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddrBookRecord.Merge(m, src) -} -func (m *AddrBookRecord) XXX_Size() int { - return m.Size() -} -func (m *AddrBookRecord) XXX_DiscardUnknown() { - xxx_messageInfo_AddrBookRecord.DiscardUnknown(m) -} - -var xxx_messageInfo_AddrBookRecord proto.InternalMessageInfo - -func (m *AddrBookRecord) GetAddrs() []*AddrBookRecord_AddrEntry { - if m != nil { - return m.Addrs - } - return nil -} - -func (m *AddrBookRecord) GetCertifiedRecord() *AddrBookRecord_CertifiedRecord { - if m != nil { - return m.CertifiedRecord - } - return nil -} - -// AddrEntry represents a single multiaddress. -type AddrBookRecord_AddrEntry struct { - Addr *ProtoAddr `protobuf:"bytes,1,opt,name=addr,proto3,customtype=ProtoAddr" json:"addr,omitempty"` - // The point in time when this address expires. - Expiry int64 `protobuf:"varint,2,opt,name=expiry,proto3" json:"expiry,omitempty"` - // The original TTL of this address. - Ttl int64 `protobuf:"varint,3,opt,name=ttl,proto3" json:"ttl,omitempty"` -} - -func (m *AddrBookRecord_AddrEntry) Reset() { *m = AddrBookRecord_AddrEntry{} } -func (m *AddrBookRecord_AddrEntry) String() string { return proto.CompactTextString(m) } -func (*AddrBookRecord_AddrEntry) ProtoMessage() {} -func (*AddrBookRecord_AddrEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_f96873690e08a98f, []int{0, 0} -} -func (m *AddrBookRecord_AddrEntry) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AddrBookRecord_AddrEntry) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AddrBookRecord_AddrEntry.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AddrBookRecord_AddrEntry) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddrBookRecord_AddrEntry.Merge(m, src) -} -func (m *AddrBookRecord_AddrEntry) XXX_Size() int { - return m.Size() -} -func (m *AddrBookRecord_AddrEntry) XXX_DiscardUnknown() { - xxx_messageInfo_AddrBookRecord_AddrEntry.DiscardUnknown(m) -} - -var xxx_messageInfo_AddrBookRecord_AddrEntry proto.InternalMessageInfo - -func (m *AddrBookRecord_AddrEntry) GetExpiry() int64 { - if m != nil { - return m.Expiry - } - return 0 -} - -func (m *AddrBookRecord_AddrEntry) GetTtl() int64 { - if m != nil { - return m.Ttl - } - return 0 -} - -// CertifiedRecord contains a serialized signed PeerRecord used to -// populate the signedAddrs list. -type AddrBookRecord_CertifiedRecord struct { - // The Seq counter from the signed PeerRecord envelope - Seq uint64 `protobuf:"varint,1,opt,name=seq,proto3" json:"seq,omitempty"` - // The serialized bytes of the SignedEnvelope containing the PeerRecord. - Raw []byte `protobuf:"bytes,2,opt,name=raw,proto3" json:"raw,omitempty"` -} - -func (m *AddrBookRecord_CertifiedRecord) Reset() { *m = AddrBookRecord_CertifiedRecord{} } -func (m *AddrBookRecord_CertifiedRecord) String() string { return proto.CompactTextString(m) } -func (*AddrBookRecord_CertifiedRecord) ProtoMessage() {} -func (*AddrBookRecord_CertifiedRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_f96873690e08a98f, []int{0, 1} -} -func (m *AddrBookRecord_CertifiedRecord) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AddrBookRecord_CertifiedRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AddrBookRecord_CertifiedRecord.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AddrBookRecord_CertifiedRecord) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddrBookRecord_CertifiedRecord.Merge(m, src) -} -func (m *AddrBookRecord_CertifiedRecord) XXX_Size() int { - return m.Size() -} -func (m *AddrBookRecord_CertifiedRecord) XXX_DiscardUnknown() { - xxx_messageInfo_AddrBookRecord_CertifiedRecord.DiscardUnknown(m) -} - -var xxx_messageInfo_AddrBookRecord_CertifiedRecord proto.InternalMessageInfo - -func (m *AddrBookRecord_CertifiedRecord) GetSeq() uint64 { - if m != nil { - return m.Seq - } - return 0 -} - -func (m *AddrBookRecord_CertifiedRecord) GetRaw() []byte { - if m != nil { - return m.Raw - } - return nil -} - -func init() { - proto.RegisterType((*AddrBookRecord)(nil), "pstore.pb.AddrBookRecord") - proto.RegisterType((*AddrBookRecord_AddrEntry)(nil), "pstore.pb.AddrBookRecord.AddrEntry") - proto.RegisterType((*AddrBookRecord_CertifiedRecord)(nil), "pstore.pb.AddrBookRecord.CertifiedRecord") -} - -func init() { proto.RegisterFile("pstore.proto", fileDescriptor_f96873690e08a98f) } - -var fileDescriptor_f96873690e08a98f = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0x2e, 0xc9, - 0x2f, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0xf1, 0x92, 0xa4, 0x74, 0xd3, - 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, - 0x2a, 0x92, 0x4a, 0xd3, 0xc0, 0x3c, 0x30, 0x07, 0xcc, 0x82, 0xe8, 0x54, 0xba, 0xcc, 0xc4, 0xc5, - 0xe7, 0x98, 0x92, 0x52, 0xe4, 0x94, 0x9f, 0x9f, 0x1d, 0x94, 0x9a, 0x9c, 0x5f, 0x94, 0x22, 0x24, - 0xcf, 0xc5, 0x94, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe3, 0xc4, 0x7f, 0xeb, 0x9e, 0x3c, - 0x77, 0x00, 0x48, 0x65, 0x40, 0x6a, 0x6a, 0x91, 0xa7, 0x4b, 0x10, 0x53, 0x66, 0x8a, 0x90, 0x25, - 0x17, 0x6b, 0x62, 0x4a, 0x4a, 0x51, 0xb1, 0x04, 0x93, 0x02, 0xb3, 0x06, 0xb7, 0x91, 0xb2, 0x1e, - 0xdc, 0x76, 0x3d, 0x54, 0xa3, 0xc0, 0x5c, 0xd7, 0xbc, 0x92, 0xa2, 0xca, 0x20, 0x88, 0x0e, 0xa1, - 0x10, 0x2e, 0x81, 0xe4, 0xd4, 0xa2, 0x92, 0xcc, 0xb4, 0xcc, 0xd4, 0x94, 0xf8, 0x22, 0xb0, 0x22, - 0x09, 0x66, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x4d, 0xdc, 0xa6, 0x38, 0xc3, 0x74, 0x40, 0xf8, 0x41, - 0xfc, 0xc9, 0xa8, 0x02, 0x52, 0x11, 0x5c, 0x9c, 0x70, 0x9b, 0x84, 0x14, 0xb9, 0x58, 0x40, 0x76, - 0x41, 0x3d, 0xc0, 0x7b, 0xeb, 0x9e, 0x3c, 0x27, 0xd8, 0x03, 0x20, 0x15, 0x41, 0x60, 0x29, 0x21, - 0x31, 0x2e, 0xb6, 0xd4, 0x8a, 0x82, 0xcc, 0xa2, 0x4a, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xe6, 0x20, - 0x28, 0x4f, 0x48, 0x80, 0x8b, 0xb9, 0xa4, 0x24, 0x07, 0xec, 0x20, 0xe6, 0x20, 0x10, 0x53, 0xca, - 0x94, 0x8b, 0x1f, 0xcd, 0x76, 0x90, 0xa2, 0xe2, 0xd4, 0x42, 0xb0, 0xf1, 0x2c, 0x41, 0x20, 0x26, - 0x48, 0xa4, 0x28, 0xb1, 0x1c, 0x6c, 0x16, 0x4f, 0x10, 0x88, 0xe9, 0xa4, 0xf0, 0xe3, 0xa1, 0x1c, - 0xe3, 0x81, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, - 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x90, 0xc4, - 0x06, 0x0e, 0x7e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, 0xcd, 0xe8, 0xd4, 0xc8, 0x01, - 0x00, 0x00, -} - -func (m *AddrBookRecord) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AddrBookRecord) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AddrBookRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CertifiedRecord != nil { - { - size, err := m.CertifiedRecord.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintPstore(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - if len(m.Addrs) > 0 { - for iNdEx := len(m.Addrs) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Addrs[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintPstore(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Id != nil { - { - size := m.Id.Size() - i -= size - if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintPstore(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *AddrBookRecord_AddrEntry) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AddrBookRecord_AddrEntry) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AddrBookRecord_AddrEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Ttl != 0 { - i = encodeVarintPstore(dAtA, i, uint64(m.Ttl)) - i-- - dAtA[i] = 0x18 - } - if m.Expiry != 0 { - i = encodeVarintPstore(dAtA, i, uint64(m.Expiry)) - i-- - dAtA[i] = 0x10 - } - if m.Addr != nil { - { - size := m.Addr.Size() - i -= size - if _, err := m.Addr.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintPstore(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *AddrBookRecord_CertifiedRecord) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AddrBookRecord_CertifiedRecord) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AddrBookRecord_CertifiedRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Raw) > 0 { - i -= len(m.Raw) - copy(dAtA[i:], m.Raw) - i = encodeVarintPstore(dAtA, i, uint64(len(m.Raw))) - i-- - dAtA[i] = 0x12 - } - if m.Seq != 0 { - i = encodeVarintPstore(dAtA, i, uint64(m.Seq)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func encodeVarintPstore(dAtA []byte, offset int, v uint64) int { - offset -= sovPstore(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func NewPopulatedAddrBookRecord(r randyPstore, easy bool) *AddrBookRecord { - this := &AddrBookRecord{} - this.Id = NewPopulatedProtoPeerID(r) - if r.Intn(5) != 0 { - v1 := r.Intn(5) - this.Addrs = make([]*AddrBookRecord_AddrEntry, v1) - for i := 0; i < v1; i++ { - this.Addrs[i] = NewPopulatedAddrBookRecord_AddrEntry(r, easy) - } - } - if r.Intn(5) != 0 { - this.CertifiedRecord = NewPopulatedAddrBookRecord_CertifiedRecord(r, easy) - } - if !easy && r.Intn(10) != 0 { - } - return this -} - -func NewPopulatedAddrBookRecord_AddrEntry(r randyPstore, easy bool) *AddrBookRecord_AddrEntry { - this := &AddrBookRecord_AddrEntry{} - this.Addr = NewPopulatedProtoAddr(r) - this.Expiry = int64(r.Int63()) - if r.Intn(2) == 0 { - this.Expiry *= -1 - } - this.Ttl = int64(r.Int63()) - if r.Intn(2) == 0 { - this.Ttl *= -1 - } - if !easy && r.Intn(10) != 0 { - } - return this -} - -func NewPopulatedAddrBookRecord_CertifiedRecord(r randyPstore, easy bool) *AddrBookRecord_CertifiedRecord { - this := &AddrBookRecord_CertifiedRecord{} - this.Seq = uint64(uint64(r.Uint32())) - v2 := r.Intn(100) - this.Raw = make([]byte, v2) - for i := 0; i < v2; i++ { - this.Raw[i] = byte(r.Intn(256)) - } - if !easy && r.Intn(10) != 0 { - } - return this -} - -type randyPstore interface { - Float32() float32 - Float64() float64 - Int63() int64 - Int31() int32 - Uint32() uint32 - Intn(n int) int -} - -func randUTF8RunePstore(r randyPstore) rune { - ru := r.Intn(62) - if ru < 10 { - return rune(ru + 48) - } else if ru < 36 { - return rune(ru + 55) - } - return rune(ru + 61) -} -func randStringPstore(r randyPstore) string { - v3 := r.Intn(100) - tmps := make([]rune, v3) - for i := 0; i < v3; i++ { - tmps[i] = randUTF8RunePstore(r) - } - return string(tmps) -} -func randUnrecognizedPstore(r randyPstore, maxFieldNumber int) (dAtA []byte) { - l := r.Intn(5) - for i := 0; i < l; i++ { - wire := r.Intn(4) - if wire == 3 { - wire = 5 - } - fieldNumber := maxFieldNumber + r.Intn(100) - dAtA = randFieldPstore(dAtA, r, fieldNumber, wire) - } - return dAtA -} -func randFieldPstore(dAtA []byte, r randyPstore, fieldNumber int, wire int) []byte { - key := uint32(fieldNumber)<<3 | uint32(wire) - switch wire { - case 0: - dAtA = encodeVarintPopulatePstore(dAtA, uint64(key)) - v4 := r.Int63() - if r.Intn(2) == 0 { - v4 *= -1 - } - dAtA = encodeVarintPopulatePstore(dAtA, uint64(v4)) - case 1: - dAtA = encodeVarintPopulatePstore(dAtA, uint64(key)) - dAtA = append(dAtA, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256))) - case 2: - dAtA = encodeVarintPopulatePstore(dAtA, uint64(key)) - ll := r.Intn(100) - dAtA = encodeVarintPopulatePstore(dAtA, uint64(ll)) - for j := 0; j < ll; j++ { - dAtA = append(dAtA, byte(r.Intn(256))) - } - default: - dAtA = encodeVarintPopulatePstore(dAtA, uint64(key)) - dAtA = append(dAtA, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256))) - } - return dAtA -} -func encodeVarintPopulatePstore(dAtA []byte, v uint64) []byte { - for v >= 1<<7 { - dAtA = append(dAtA, uint8(uint64(v)&0x7f|0x80)) - v >>= 7 - } - dAtA = append(dAtA, uint8(v)) - return dAtA -} -func (m *AddrBookRecord) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Id != nil { - l = m.Id.Size() - n += 1 + l + sovPstore(uint64(l)) - } - if len(m.Addrs) > 0 { - for _, e := range m.Addrs { - l = e.Size() - n += 1 + l + sovPstore(uint64(l)) - } - } - if m.CertifiedRecord != nil { - l = m.CertifiedRecord.Size() - n += 1 + l + sovPstore(uint64(l)) - } - return n -} - -func (m *AddrBookRecord_AddrEntry) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Addr != nil { - l = m.Addr.Size() - n += 1 + l + sovPstore(uint64(l)) - } - if m.Expiry != 0 { - n += 1 + sovPstore(uint64(m.Expiry)) - } - if m.Ttl != 0 { - n += 1 + sovPstore(uint64(m.Ttl)) - } - return n -} - -func (m *AddrBookRecord_CertifiedRecord) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Seq != 0 { - n += 1 + sovPstore(uint64(m.Seq)) - } - l = len(m.Raw) - if l > 0 { - n += 1 + l + sovPstore(uint64(l)) - } - return n -} - -func sovPstore(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozPstore(x uint64) (n int) { - return sovPstore(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *AddrBookRecord) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: AddrBookRecord: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: AddrBookRecord: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthPstore - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthPstore - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var v ProtoPeerID - m.Id = &v - if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addrs", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthPstore - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthPstore - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Addrs = append(m.Addrs, &AddrBookRecord_AddrEntry{}) - if err := m.Addrs[len(m.Addrs)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CertifiedRecord", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthPstore - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthPstore - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.CertifiedRecord == nil { - m.CertifiedRecord = &AddrBookRecord_CertifiedRecord{} - } - if err := m.CertifiedRecord.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipPstore(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthPstore - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *AddrBookRecord_AddrEntry) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: AddrEntry: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: AddrEntry: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Addr", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthPstore - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthPstore - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - var v ProtoAddr - m.Addr = &v - if err := m.Addr.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Expiry", wireType) - } - m.Expiry = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Expiry |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Ttl", wireType) - } - m.Ttl = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Ttl |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipPstore(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthPstore - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *AddrBookRecord_CertifiedRecord) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: CertifiedRecord: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: CertifiedRecord: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Seq", wireType) - } - m.Seq = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Seq |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Raw", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPstore - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthPstore - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthPstore - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Raw = append(m.Raw[:0], dAtA[iNdEx:postIndex]...) - if m.Raw == nil { - m.Raw = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipPstore(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthPstore - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipPstore(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPstore - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPstore - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPstore - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthPstore - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupPstore - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthPstore - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthPstore = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowPstore = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupPstore = fmt.Errorf("proto: unexpected end of group") -) diff --git a/pb/pstore.proto b/pb/pstore.proto deleted file mode 100644 index 0d1abd1..0000000 --- a/pb/pstore.proto +++ /dev/null @@ -1,40 +0,0 @@ -syntax = "proto3"; -package pstore.pb; - -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - -option (gogoproto.benchgen_all) = true; -option (gogoproto.populate_all) = true; - -// AddrBookRecord represents a record for a peer in the address book. -message AddrBookRecord { - // The peer ID. - bytes id = 1 [(gogoproto.customtype) = "ProtoPeerID"]; - - // The multiaddresses. This is a sorted list where element 0 expires the soonest. - repeated AddrEntry addrs = 2; - - // The most recently received signed PeerRecord. - CertifiedRecord certified_record = 3; - - // AddrEntry represents a single multiaddress. - message AddrEntry { - bytes addr = 1 [(gogoproto.customtype) = "ProtoAddr"]; - - // The point in time when this address expires. - int64 expiry = 2; - - // The original TTL of this address. - int64 ttl = 3; - } - - // CertifiedRecord contains a serialized signed PeerRecord used to - // populate the signedAddrs list. - message CertifiedRecord { - // The Seq counter from the signed PeerRecord envelope - uint64 seq = 1; - - // The serialized bytes of the SignedEnvelope containing the PeerRecord. - bytes raw = 2; - } -} diff --git a/pb/pstorepb_test.go b/pb/pstorepb_test.go deleted file mode 100644 index 12d2980..0000000 --- a/pb/pstorepb_test.go +++ /dev/null @@ -1,183 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pstore.proto - -package pstore_pb - -import ( - fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" - proto "github.com/gogo/protobuf/proto" - math "math" - math_rand "math/rand" - testing "testing" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -func BenchmarkAddrBookRecordProtoMarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord, 10000) - for i := 0; i < 10000; i++ { - pops[i] = NewPopulatedAddrBookRecord(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(pops[i%10000]) - if err != nil { - panic(err) - } - total += len(dAtA) - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecordProtoUnmarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - datas := make([][]byte, 10000) - for i := 0; i < 10000; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(NewPopulatedAddrBookRecord(popr, false)) - if err != nil { - panic(err) - } - datas[i] = dAtA - } - msg := &AddrBookRecord{} - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += len(datas[i%10000]) - if err := github_com_gogo_protobuf_proto.Unmarshal(datas[i%10000], msg); err != nil { - panic(err) - } - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_AddrEntryProtoMarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord_AddrEntry, 10000) - for i := 0; i < 10000; i++ { - pops[i] = NewPopulatedAddrBookRecord_AddrEntry(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(pops[i%10000]) - if err != nil { - panic(err) - } - total += len(dAtA) - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_AddrEntryProtoUnmarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - datas := make([][]byte, 10000) - for i := 0; i < 10000; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(NewPopulatedAddrBookRecord_AddrEntry(popr, false)) - if err != nil { - panic(err) - } - datas[i] = dAtA - } - msg := &AddrBookRecord_AddrEntry{} - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += len(datas[i%10000]) - if err := github_com_gogo_protobuf_proto.Unmarshal(datas[i%10000], msg); err != nil { - panic(err) - } - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_CertifiedRecordProtoMarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord_CertifiedRecord, 10000) - for i := 0; i < 10000; i++ { - pops[i] = NewPopulatedAddrBookRecord_CertifiedRecord(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(pops[i%10000]) - if err != nil { - panic(err) - } - total += len(dAtA) - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_CertifiedRecordProtoUnmarshal(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - datas := make([][]byte, 10000) - for i := 0; i < 10000; i++ { - dAtA, err := github_com_gogo_protobuf_proto.Marshal(NewPopulatedAddrBookRecord_CertifiedRecord(popr, false)) - if err != nil { - panic(err) - } - datas[i] = dAtA - } - msg := &AddrBookRecord_CertifiedRecord{} - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += len(datas[i%10000]) - if err := github_com_gogo_protobuf_proto.Unmarshal(datas[i%10000], msg); err != nil { - panic(err) - } - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecordSize(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord, 1000) - for i := 0; i < 1000; i++ { - pops[i] = NewPopulatedAddrBookRecord(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += pops[i%1000].Size() - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_AddrEntrySize(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord_AddrEntry, 1000) - for i := 0; i < 1000; i++ { - pops[i] = NewPopulatedAddrBookRecord_AddrEntry(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += pops[i%1000].Size() - } - b.SetBytes(int64(total / b.N)) -} - -func BenchmarkAddrBookRecord_CertifiedRecordSize(b *testing.B) { - popr := math_rand.New(math_rand.NewSource(616)) - total := 0 - pops := make([]*AddrBookRecord_CertifiedRecord, 1000) - for i := 0; i < 1000; i++ { - pops[i] = NewPopulatedAddrBookRecord_CertifiedRecord(popr, false) - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - total += pops[i%1000].Size() - } - b.SetBytes(int64(total / b.N)) -} - -//These tests are generated by github.com/gogo/protobuf/plugin/testgen diff --git a/peerstore.go b/peerstore.go index 9f5eda8..94f8f58 100644 --- a/peerstore.go +++ b/peerstore.go @@ -1,22 +1,18 @@ +// Deprecated: This package has moved into go-libp2p as a sub-package: github.com/libp2p/go-libp2p/p2p/host/peerstore. package peerstore import ( - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" + "github.com/libp2p/go-libp2p/core/peer" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore" ) +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore.PeerInfos instead func PeerInfos(ps pstore.Peerstore, peers peer.IDSlice) []peer.AddrInfo { - pi := make([]peer.AddrInfo, len(peers)) - for i, p := range peers { - pi[i] = ps.PeerInfo(p) - } - return pi + return peerstore.PeerInfos(ps, peers) } +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore.PeerInfoIDs instead func PeerInfoIDs(pis []peer.AddrInfo) peer.IDSlice { - ps := make(peer.IDSlice, len(pis)) - for i, pi := range pis { - ps[i] = pi.ID - } - return ps + return peerstore.PeerInfoIDs(pis) } diff --git a/pstoreds/addr_book.go b/pstoreds/addr_book.go index 6c7bed7..504f83b 100644 --- a/pstoreds/addr_book.go +++ b/pstoreds/addr_book.go @@ -2,170 +2,13 @@ package pstoreds import ( "context" - "fmt" - "sort" - "sync" - "time" + + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ds "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/query" - logging "github.com/ipfs/go-log/v2" - - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" - "github.com/libp2p/go-libp2p-core/record" - pb "github.com/libp2p/go-libp2p-peerstore/pb" - "github.com/libp2p/go-libp2p-peerstore/pstoremem" - - lru "github.com/hashicorp/golang-lru" - b32 "github.com/multiformats/go-base32" - ma "github.com/multiformats/go-multiaddr" ) -type ttlWriteMode int - -const ( - ttlOverride ttlWriteMode = iota - ttlExtend -) - -var ( - log = logging.Logger("peerstore/ds") - - // Peer addresses are stored db key pattern: - // /peers/addrs/ - addrBookBase = ds.NewKey("/peers/addrs") -) - -// addrsRecord decorates the AddrBookRecord with locks and metadata. -type addrsRecord struct { - sync.RWMutex - *pb.AddrBookRecord - dirty bool -} - -// flush writes the record to the datastore by calling ds.Put, unless the record is -// marked for deletion, in which case we call ds.Delete. To be called within a lock. -func (r *addrsRecord) flush(write ds.Write) (err error) { - key := addrBookBase.ChildString(b32.RawStdEncoding.EncodeToString([]byte(r.Id.ID))) - - if len(r.Addrs) == 0 { - if err = write.Delete(context.TODO(), key); err == nil { - r.dirty = false - } - return err - } - - data, err := r.Marshal() - if err != nil { - return err - } - if err = write.Put(context.TODO(), key, data); err != nil { - return err - } - // write succeeded; record is no longer dirty. - r.dirty = false - return nil -} - -// clean is called on records to perform housekeeping. The return value indicates if the record was changed -// as a result of this call. -// -// clean does the following: -// * sorts addresses by expiration (soonest expiring first). -// * removes expired addresses. -// -// It short-circuits optimistically when there's nothing to do. -// -// clean is called from several points: -// * when accessing an entry. -// * when performing periodic GC. -// * after an entry has been modified (e.g. addresses have been added or removed, TTLs updated, etc.) -// -// If the return value is true, the caller should perform a flush immediately to sync the record with the store. -func (r *addrsRecord) clean(now time.Time) (chgd bool) { - nowUnix := now.Unix() - addrsLen := len(r.Addrs) - - if !r.dirty && !r.hasExpiredAddrs(nowUnix) { - // record is not dirty, and we have no expired entries to purge. - return false - } - - if addrsLen == 0 { - // this is a ghost record; let's signal it has to be written. - // flush() will take care of doing the deletion. - return true - } - - if r.dirty && addrsLen > 1 { - sort.Slice(r.Addrs, func(i, j int) bool { - return r.Addrs[i].Expiry < r.Addrs[j].Expiry - }) - } - - r.Addrs = removeExpired(r.Addrs, nowUnix) - - return r.dirty || len(r.Addrs) != addrsLen -} - -func (r *addrsRecord) hasExpiredAddrs(now int64) bool { - if len(r.Addrs) > 0 && r.Addrs[0].Expiry <= now { - return true - } - return false -} - -func removeExpired(entries []*pb.AddrBookRecord_AddrEntry, now int64) []*pb.AddrBookRecord_AddrEntry { - // since addresses are sorted by expiration, we find the first - // survivor and split the slice on its index. - pivot := -1 - for i, addr := range entries { - if addr.Expiry > now { - break - } - pivot = i - } - - return entries[pivot+1:] -} - -// dsAddrBook is an address book backed by a Datastore with a GC procedure to purge expired entries. It uses an -// in-memory address stream manager. See the NewAddrBook for more information. -type dsAddrBook struct { - ctx context.Context - opts Options - - cache cache - ds ds.Batching - gc *dsAddrBookGc - subsManager *pstoremem.AddrSubManager - - // controls children goroutine lifetime. - childrenDone sync.WaitGroup - cancelFn func() - - clock clock -} - -type clock interface { - Now() time.Time - After(d time.Duration) <-chan time.Time -} - -type realclock struct{} - -func (rc realclock) Now() time.Time { - return time.Now() -} - -func (rc realclock) After(d time.Duration) <-chan time.Time { - return time.After(d) -} - -var _ pstore.AddrBook = (*dsAddrBook)(nil) -var _ pstore.CertifiedAddrBook = (*dsAddrBook)(nil) - // NewAddrBook initializes a new datastore-backed address book. It serves as a drop-in replacement for pstoremem // (memory-backed peerstore), and works with any datastore implementing the ds.Batching interface. // @@ -175,431 +18,18 @@ var _ pstore.CertifiedAddrBook = (*dsAddrBook)(nil) // // The user has a choice of two GC algorithms: // -// - lookahead GC: minimises the amount of full store traversals by maintaining a time-indexed list of entries that -// need to be visited within the period specified in Options.GCLookaheadInterval. This is useful in scenarios with -// considerable TTL variance, coupled with datastores whose native iterators return entries in lexicographical key -// order. Enable this mode by passing a value Options.GCLookaheadInterval > 0. Lookahead windows are jumpy, not -// sliding. Purges operate exclusively over the lookahead window with periodicity Options.GCPurgeInterval. +// - lookahead GC: minimises the amount of full store traversals by maintaining a time-indexed list of entries that +// need to be visited within the period specified in Options.GCLookaheadInterval. This is useful in scenarios with +// considerable TTL variance, coupled with datastores whose native iterators return entries in lexicographical key +// order. Enable this mode by passing a value Options.GCLookaheadInterval > 0. Lookahead windows are jumpy, not +// sliding. Purges operate exclusively over the lookahead window with periodicity Options.GCPurgeInterval. // -// - full-purge GC (default): performs a full visit of the store with periodicity Options.GCPurgeInterval. Useful when -// the range of possible TTL values is small and the values themselves are also extreme, e.g. 10 minutes or -// permanent, popular values used in other libp2p modules. In this cited case, optimizing with lookahead windows -// makes little sense. -func NewAddrBook(ctx context.Context, store ds.Batching, opts Options) (ab *dsAddrBook, err error) { - ctx, cancelFn := context.WithCancel(ctx) - ab = &dsAddrBook{ - ctx: ctx, - ds: store, - opts: opts, - cancelFn: cancelFn, - subsManager: pstoremem.NewAddrSubManager(), - clock: realclock{}, - } - - if opts.Clock != nil { - ab.clock = opts.Clock - } - - if opts.CacheSize > 0 { - if ab.cache, err = lru.NewARC(int(opts.CacheSize)); err != nil { - return nil, err - } - } else { - ab.cache = new(noopCache) - } - - if ab.gc, err = newAddressBookGc(ctx, ab); err != nil { - return nil, err - } - - return ab, nil -} - -func (ab *dsAddrBook) Close() error { - ab.cancelFn() - ab.childrenDone.Wait() - return nil -} - -// loadRecord is a read-through fetch. It fetches a record from cache, falling back to the -// datastore upon a miss, and returning a newly initialized record if the peer doesn't exist. +// - full-purge GC (default): performs a full visit of the store with periodicity Options.GCPurgeInterval. Useful when +// the range of possible TTL values is small and the values themselves are also extreme, e.g. 10 minutes or +// permanent, popular values used in other libp2p modules. In this cited case, optimizing with lookahead windows +// makes little sense. // -// loadRecord calls clean() on an existing record before returning it. If the record changes -// as a result and the update argument is true, the resulting state is saved in the datastore. -// -// If the cache argument is true, the record is inserted in the cache when loaded from the datastore. -func (ab *dsAddrBook) loadRecord(id peer.ID, cache bool, update bool) (pr *addrsRecord, err error) { - if e, ok := ab.cache.Get(id); ok { - pr = e.(*addrsRecord) - pr.Lock() - defer pr.Unlock() - - if pr.clean(ab.clock.Now()) && update { - err = pr.flush(ab.ds) - } - return pr, err - } - - pr = &addrsRecord{AddrBookRecord: &pb.AddrBookRecord{}} - key := addrBookBase.ChildString(b32.RawStdEncoding.EncodeToString([]byte(id))) - data, err := ab.ds.Get(context.TODO(), key) - - switch err { - case ds.ErrNotFound: - err = nil - pr.Id = &pb.ProtoPeerID{ID: id} - case nil: - if err = pr.Unmarshal(data); err != nil { - return nil, err - } - // this record is new and local for now (not in cache), so we don't need to lock. - if pr.clean(ab.clock.Now()) && update { - err = pr.flush(ab.ds) - } - default: - return nil, err - } - - if cache { - ab.cache.Add(id, pr) - } - return pr, err -} - -// AddAddr will add a new address if it's not already in the AddrBook. -func (ab *dsAddrBook) AddAddr(p peer.ID, addr ma.Multiaddr, ttl time.Duration) { - ab.AddAddrs(p, []ma.Multiaddr{addr}, ttl) -} - -// AddAddrs will add many new addresses if they're not already in the AddrBook. -func (ab *dsAddrBook) AddAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) { - if ttl <= 0 { - return - } - addrs = cleanAddrs(addrs) - ab.setAddrs(p, addrs, ttl, ttlExtend, false) -} - -// ConsumePeerRecord adds addresses from a signed peer.PeerRecord (contained in -// a record.Envelope), which will expire after the given TTL. -// See https://godoc.org/github.com/libp2p/go-libp2p-core/peerstore#CertifiedAddrBook for more details. -func (ab *dsAddrBook) ConsumePeerRecord(recordEnvelope *record.Envelope, ttl time.Duration) (bool, error) { - r, err := recordEnvelope.Record() - if err != nil { - return false, err - } - rec, ok := r.(*peer.PeerRecord) - if !ok { - return false, fmt.Errorf("envelope did not contain PeerRecord") - } - if !rec.PeerID.MatchesPublicKey(recordEnvelope.PublicKey) { - return false, fmt.Errorf("signing key does not match PeerID in PeerRecord") - } - - // ensure that the seq number from envelope is >= any previously received seq no - // update when equal to extend the ttls - if ab.latestPeerRecordSeq(rec.PeerID) > rec.Seq { - return false, nil - } - - addrs := cleanAddrs(rec.Addrs) - err = ab.setAddrs(rec.PeerID, addrs, ttl, ttlExtend, true) - if err != nil { - return false, err - } - - err = ab.storeSignedPeerRecord(rec.PeerID, recordEnvelope, rec) - if err != nil { - return false, err - } - return true, nil -} - -func (ab *dsAddrBook) latestPeerRecordSeq(p peer.ID) uint64 { - pr, err := ab.loadRecord(p, true, false) - if err != nil { - // We ignore the error because we don't want to fail storing a new record in this - // case. - log.Errorw("unable to load record", "peer", p, "error", err) - return 0 - } - pr.RLock() - defer pr.RUnlock() - - if len(pr.Addrs) == 0 || pr.CertifiedRecord == nil || len(pr.CertifiedRecord.Raw) == 0 { - return 0 - } - return pr.CertifiedRecord.Seq -} - -func (ab *dsAddrBook) storeSignedPeerRecord(p peer.ID, envelope *record.Envelope, rec *peer.PeerRecord) error { - envelopeBytes, err := envelope.Marshal() - if err != nil { - return err - } - // reload record and add routing state - // this has to be done after we add the addresses, since if - // we try to flush a datastore record with no addresses, - // it will just get deleted - pr, err := ab.loadRecord(p, true, false) - if err != nil { - return err - } - pr.Lock() - defer pr.Unlock() - pr.CertifiedRecord = &pb.AddrBookRecord_CertifiedRecord{ - Seq: rec.Seq, - Raw: envelopeBytes, - } - pr.dirty = true - err = pr.flush(ab.ds) - return err -} - -// GetPeerRecord returns a record.Envelope containing a peer.PeerRecord for the -// given peer id, if one exists. -// Returns nil if no signed PeerRecord exists for the peer. -func (ab *dsAddrBook) GetPeerRecord(p peer.ID) *record.Envelope { - pr, err := ab.loadRecord(p, true, false) - if err != nil { - log.Errorf("unable to load record for peer %s: %v", p.Pretty(), err) - return nil - } - pr.RLock() - defer pr.RUnlock() - if pr.CertifiedRecord == nil || len(pr.CertifiedRecord.Raw) == 0 || len(pr.Addrs) == 0 { - return nil - } - state, _, err := record.ConsumeEnvelope(pr.CertifiedRecord.Raw, peer.PeerRecordEnvelopeDomain) - if err != nil { - log.Errorf("error unmarshaling stored signed peer record for peer %s: %v", p.Pretty(), err) - return nil - } - return state -} - -// SetAddr will add or update the TTL of an address in the AddrBook. -func (ab *dsAddrBook) SetAddr(p peer.ID, addr ma.Multiaddr, ttl time.Duration) { - ab.SetAddrs(p, []ma.Multiaddr{addr}, ttl) -} - -// SetAddrs will add or update the TTLs of addresses in the AddrBook. -func (ab *dsAddrBook) SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) { - addrs = cleanAddrs(addrs) - if ttl <= 0 { - ab.deleteAddrs(p, addrs) - return - } - ab.setAddrs(p, addrs, ttl, ttlOverride, false) -} - -// UpdateAddrs will update any addresses for a given peer and TTL combination to -// have a new TTL. -func (ab *dsAddrBook) UpdateAddrs(p peer.ID, oldTTL time.Duration, newTTL time.Duration) { - pr, err := ab.loadRecord(p, true, false) - if err != nil { - log.Errorf("failed to update ttls for peer %s: %s\n", p.Pretty(), err) - return - } - - pr.Lock() - defer pr.Unlock() - - newExp := ab.clock.Now().Add(newTTL).Unix() - for _, entry := range pr.Addrs { - if entry.Ttl != int64(oldTTL) { - continue - } - entry.Ttl, entry.Expiry = int64(newTTL), newExp - pr.dirty = true - } - - if pr.clean(ab.clock.Now()) { - pr.flush(ab.ds) - } -} - -// Addrs returns all of the non-expired addresses for a given peer. -func (ab *dsAddrBook) Addrs(p peer.ID) []ma.Multiaddr { - pr, err := ab.loadRecord(p, true, true) - if err != nil { - log.Warn("failed to load peerstore entry for peer %v while querying addrs, err: %v", p, err) - return nil - } - - pr.RLock() - defer pr.RUnlock() - - addrs := make([]ma.Multiaddr, len(pr.Addrs)) - for i, a := range pr.Addrs { - addrs[i] = a.Addr - } - return addrs -} - -// Peers returns all of the peer IDs for which the AddrBook has addresses. -func (ab *dsAddrBook) PeersWithAddrs() peer.IDSlice { - ids, err := uniquePeerIds(ab.ds, addrBookBase, func(result query.Result) string { - return ds.RawKey(result.Key).Name() - }) - if err != nil { - log.Errorf("error while retrieving peers with addresses: %v", err) - } - return ids -} - -// AddrStream returns a channel on which all new addresses discovered for a -// given peer ID will be published. -func (ab *dsAddrBook) AddrStream(ctx context.Context, p peer.ID) <-chan ma.Multiaddr { - initial := ab.Addrs(p) - return ab.subsManager.AddrStream(ctx, p, initial) -} - -// ClearAddrs will delete all known addresses for a peer ID. -func (ab *dsAddrBook) ClearAddrs(p peer.ID) { - ab.cache.Remove(p) - - key := addrBookBase.ChildString(b32.RawStdEncoding.EncodeToString([]byte(p))) - if err := ab.ds.Delete(context.TODO(), key); err != nil { - log.Errorf("failed to clear addresses for peer %s: %v", p.Pretty(), err) - } -} - -func (ab *dsAddrBook) setAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration, mode ttlWriteMode, signed bool) (err error) { - if len(addrs) == 0 { - return nil - } - - pr, err := ab.loadRecord(p, true, false) - if err != nil { - return fmt.Errorf("failed to load peerstore entry for peer %v while setting addrs, err: %v", p, err) - } - - pr.Lock() - defer pr.Unlock() - - // // if we have a signed PeerRecord, ignore attempts to add unsigned addrs - // if !signed && pr.CertifiedRecord != nil { - // return nil - // } - - newExp := ab.clock.Now().Add(ttl).Unix() - addrsMap := make(map[string]*pb.AddrBookRecord_AddrEntry, len(pr.Addrs)) - for _, addr := range pr.Addrs { - addrsMap[string(addr.Addr.Bytes())] = addr - } - - updateExisting := func(incoming ma.Multiaddr) *pb.AddrBookRecord_AddrEntry { - existingEntry := addrsMap[string(incoming.Bytes())] - if existingEntry == nil { - return nil - } - - switch mode { - case ttlOverride: - existingEntry.Ttl = int64(ttl) - existingEntry.Expiry = newExp - case ttlExtend: - if int64(ttl) > existingEntry.Ttl { - existingEntry.Ttl = int64(ttl) - } - if newExp > existingEntry.Expiry { - existingEntry.Expiry = newExp - } - default: - panic("BUG: unimplemented ttl mode") - } - return existingEntry - } - - var entries []*pb.AddrBookRecord_AddrEntry - for _, incoming := range addrs { - existingEntry := updateExisting(incoming) - - if existingEntry == nil { - // if signed { - // entries = append(entries, existingEntry) - // } - // } else { - // new addr, add & broadcast - entry := &pb.AddrBookRecord_AddrEntry{ - Addr: &pb.ProtoAddr{Multiaddr: incoming}, - Ttl: int64(ttl), - Expiry: newExp, - } - entries = append(entries, entry) - - // note: there's a minor chance that writing the record will fail, in which case we would've broadcast - // the addresses without persisting them. This is very unlikely and not much of an issue. - ab.subsManager.BroadcastAddr(p, incoming) - } - } - - // if signed { - // // when adding signed addrs, we want to keep _only_ the incoming addrs - // pr.Addrs = entries - // } else { - pr.Addrs = append(pr.Addrs, entries...) - // } - - pr.dirty = true - pr.clean(ab.clock.Now()) - return pr.flush(ab.ds) -} - -// deletes addresses in place, avoiding copies until we encounter the first deletion. -// does not preserve order, but entries are re-sorted before flushing to disk anyway. -func deleteInPlace(s []*pb.AddrBookRecord_AddrEntry, addrs []ma.Multiaddr) []*pb.AddrBookRecord_AddrEntry { - if s == nil || len(addrs) == 0 { - return s - } - survived := len(s) -Outer: - for i, addr := range s { - for _, del := range addrs { - if !addr.Addr.Equal(del) { - continue - } - survived-- - // if there are no survivors, bail out - if survived == 0 { - break Outer - } - s[i] = s[survived] - // we've already dealt with s[i], move to the next - continue Outer - } - } - return s[:survived] -} - -func (ab *dsAddrBook) deleteAddrs(p peer.ID, addrs []ma.Multiaddr) (err error) { - pr, err := ab.loadRecord(p, false, false) - if err != nil { - return fmt.Errorf("failed to load peerstore entry for peer %v while deleting addrs, err: %v", p, err) - } - - pr.Lock() - defer pr.Unlock() - - if pr.Addrs == nil { - return nil - } - - pr.Addrs = deleteInPlace(pr.Addrs, addrs) - - pr.dirty = true - pr.clean(ab.clock.Now()) - return pr.flush(ab.ds) -} - -func cleanAddrs(addrs []ma.Multiaddr) []ma.Multiaddr { - clean := make([]ma.Multiaddr, 0, len(addrs)) - for _, addr := range addrs { - if addr == nil { - continue - } - clean = append(clean, addr) - } - return clean +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.NewAddrBook instead +func NewAddrBook(ctx context.Context, store ds.Batching, opts Options) (pstore.AddrBook, error) { + return pstoreds.NewAddrBook(ctx, store, opts) } diff --git a/pstoreds/addr_book_gc.go b/pstoreds/addr_book_gc.go deleted file mode 100644 index 9980217..0000000 --- a/pstoreds/addr_book_gc.go +++ /dev/null @@ -1,410 +0,0 @@ -package pstoreds - -import ( - "context" - "fmt" - "strconv" - "time" - - ds "github.com/ipfs/go-datastore" - query "github.com/ipfs/go-datastore/query" - - peer "github.com/libp2p/go-libp2p-core/peer" - pb "github.com/libp2p/go-libp2p-peerstore/pb" - - b32 "github.com/multiformats/go-base32" -) - -var ( - // GC lookahead entries are stored in key pattern: - // /peers/gc/addrs// => nil - // in databases with lexicographical key order, this time-indexing allows us to visit - // only the timeslice we are interested in. - gcLookaheadBase = ds.NewKey("/peers/gc/addrs") - - // queries - purgeLookaheadQuery = query.Query{ - Prefix: gcLookaheadBase.String(), - Orders: []query.Order{query.OrderByFunction(orderByTimestampInKey)}, - KeysOnly: true, - } - - purgeStoreQuery = query.Query{ - Prefix: addrBookBase.String(), - Orders: []query.Order{query.OrderByKey{}}, - KeysOnly: false, - } - - populateLookaheadQuery = query.Query{ - Prefix: addrBookBase.String(), - Orders: []query.Order{query.OrderByKey{}}, - KeysOnly: true, - } -) - -// dsAddrBookGc is responsible for garbage collection in a datastore-backed address book. -type dsAddrBookGc struct { - ctx context.Context - ab *dsAddrBook - running chan struct{} - lookaheadEnabled bool - purgeFunc func() - currWindowEnd int64 -} - -func newAddressBookGc(ctx context.Context, ab *dsAddrBook) (*dsAddrBookGc, error) { - if ab.opts.GCPurgeInterval < 0 { - return nil, fmt.Errorf("negative GC purge interval provided: %s", ab.opts.GCPurgeInterval) - } - if ab.opts.GCLookaheadInterval < 0 { - return nil, fmt.Errorf("negative GC lookahead interval provided: %s", ab.opts.GCLookaheadInterval) - } - if ab.opts.GCInitialDelay < 0 { - return nil, fmt.Errorf("negative GC initial delay provided: %s", ab.opts.GCInitialDelay) - } - if ab.opts.GCLookaheadInterval > 0 && ab.opts.GCLookaheadInterval < ab.opts.GCPurgeInterval { - return nil, fmt.Errorf("lookahead interval must be larger than purge interval, respectively: %s, %s", - ab.opts.GCLookaheadInterval, ab.opts.GCPurgeInterval) - } - - lookaheadEnabled := ab.opts.GCLookaheadInterval > 0 - gc := &dsAddrBookGc{ - ctx: ctx, - ab: ab, - running: make(chan struct{}, 1), - lookaheadEnabled: lookaheadEnabled, - } - - if lookaheadEnabled { - gc.purgeFunc = gc.purgeLookahead - } else { - gc.purgeFunc = gc.purgeStore - } - - // do not start GC timers if purge is disabled; this GC can only be triggered manually. - if ab.opts.GCPurgeInterval > 0 { - gc.ab.childrenDone.Add(1) - go gc.background() - } - - return gc, nil -} - -// gc prunes expired addresses from the datastore at regular intervals. It should be spawned as a goroutine. -func (gc *dsAddrBookGc) background() { - defer gc.ab.childrenDone.Done() - - select { - case <-gc.ab.clock.After(gc.ab.opts.GCInitialDelay): - case <-gc.ab.ctx.Done(): - // yield if we have been cancelled/closed before the delay elapses. - return - } - - purgeTimer := time.NewTicker(gc.ab.opts.GCPurgeInterval) - defer purgeTimer.Stop() - - var lookaheadCh <-chan time.Time - if gc.lookaheadEnabled { - lookaheadTimer := time.NewTicker(gc.ab.opts.GCLookaheadInterval) - lookaheadCh = lookaheadTimer.C - gc.populateLookahead() // do a lookahead now - defer lookaheadTimer.Stop() - } - - for { - select { - case <-purgeTimer.C: - gc.purgeFunc() - - case <-lookaheadCh: - // will never trigger if lookahead is disabled (nil Duration). - gc.populateLookahead() - - case <-gc.ctx.Done(): - return - } - } -} - -// purgeCycle runs a single GC purge cycle. It operates within the lookahead window if lookahead is enabled; else it -// visits all entries in the datastore, deleting the addresses that have expired. -func (gc *dsAddrBookGc) purgeLookahead() { - select { - case gc.running <- struct{}{}: - defer func() { <-gc.running }() - default: - // yield if lookahead is running. - return - } - - var id peer.ID - record := &addrsRecord{AddrBookRecord: &pb.AddrBookRecord{}} // empty record to reuse and avoid allocs. - batch, err := newCyclicBatch(gc.ab.ds, defaultOpsPerCyclicBatch) - if err != nil { - log.Warnf("failed while creating batch to purge GC entries: %v", err) - } - - // This function drops an unparseable GC entry; this is for safety. It is an escape hatch in case - // we modify the format of keys going forward. If a user runs a new version against an old DB, - // if we don't clean up unparseable entries we'll end up accumulating garbage. - dropInError := func(key ds.Key, err error, msg string) { - if err != nil { - log.Warnf("failed while %s record with GC key: %v, err: %v; deleting", msg, key, err) - } - if err = batch.Delete(context.TODO(), key); err != nil { - log.Warnf("failed to delete corrupt GC lookahead entry: %v, err: %v", key, err) - } - } - - // This function drops a GC key if the entry is cleaned correctly. It may reschedule another visit - // if the next earliest expiry falls within the current window again. - dropOrReschedule := func(key ds.Key, ar *addrsRecord) { - if err := batch.Delete(context.TODO(), key); err != nil { - log.Warnf("failed to delete lookahead entry: %v, err: %v", key, err) - } - - // re-add the record if it needs to be visited again in this window. - if len(ar.Addrs) != 0 && ar.Addrs[0].Expiry <= gc.currWindowEnd { - gcKey := gcLookaheadBase.ChildString(fmt.Sprintf("%d/%s", ar.Addrs[0].Expiry, key.Name())) - if err := batch.Put(context.TODO(), gcKey, []byte{}); err != nil { - log.Warnf("failed to add new GC key: %v, err: %v", gcKey, err) - } - } - } - - results, err := gc.ab.ds.Query(context.TODO(), purgeLookaheadQuery) - if err != nil { - log.Warnf("failed while fetching entries to purge: %v", err) - return - } - defer results.Close() - - now := gc.ab.clock.Now().Unix() - - // keys: /peers/gc/addrs// - // values: nil - for result := range results.Next() { - gcKey := ds.RawKey(result.Key) - ts, err := strconv.ParseInt(gcKey.Parent().Name(), 10, 64) - if err != nil { - dropInError(gcKey, err, "parsing timestamp") - log.Warnf("failed while parsing timestamp from key: %v, err: %v", result.Key, err) - continue - } else if ts > now { - // this is an ordered cursor; when we hit an entry with a timestamp beyond now, we can break. - break - } - - idb32, err := b32.RawStdEncoding.DecodeString(gcKey.Name()) - if err != nil { - dropInError(gcKey, err, "parsing peer ID") - log.Warnf("failed while parsing b32 peer ID from key: %v, err: %v", result.Key, err) - continue - } - - id, err = peer.IDFromBytes(idb32) - if err != nil { - dropInError(gcKey, err, "decoding peer ID") - log.Warnf("failed while decoding peer ID from key: %v, err: %v", result.Key, err) - continue - } - - // if the record is in cache, we clean it and flush it if necessary. - if e, ok := gc.ab.cache.Peek(id); ok { - cached := e.(*addrsRecord) - cached.Lock() - if cached.clean(gc.ab.clock.Now()) { - if err = cached.flush(batch); err != nil { - log.Warnf("failed to flush entry modified by GC for peer: &v, err: %v", id.Pretty(), err) - } - } - dropOrReschedule(gcKey, cached) - cached.Unlock() - continue - } - - record.Reset() - - // otherwise, fetch it from the store, clean it and flush it. - entryKey := addrBookBase.ChildString(gcKey.Name()) - val, err := gc.ab.ds.Get(context.TODO(), entryKey) - if err != nil { - // captures all errors, including ErrNotFound. - dropInError(gcKey, err, "fetching entry") - continue - } - err = record.Unmarshal(val) - if err != nil { - dropInError(gcKey, err, "unmarshalling entry") - continue - } - if record.clean(gc.ab.clock.Now()) { - err = record.flush(batch) - if err != nil { - log.Warnf("failed to flush entry modified by GC for peer: &v, err: %v", id.Pretty(), err) - } - } - dropOrReschedule(gcKey, record) - } - - if err = batch.Commit(context.TODO()); err != nil { - log.Warnf("failed to commit GC purge batch: %v", err) - } -} - -func (gc *dsAddrBookGc) purgeStore() { - select { - case gc.running <- struct{}{}: - defer func() { <-gc.running }() - default: - // yield if lookahead is running. - return - } - - record := &addrsRecord{AddrBookRecord: &pb.AddrBookRecord{}} // empty record to reuse and avoid allocs. - batch, err := newCyclicBatch(gc.ab.ds, defaultOpsPerCyclicBatch) - if err != nil { - log.Warnf("failed while creating batch to purge GC entries: %v", err) - } - - results, err := gc.ab.ds.Query(context.TODO(), purgeStoreQuery) - if err != nil { - log.Warnf("failed while opening iterator: %v", err) - return - } - defer results.Close() - - // keys: /peers/addrs/ - for result := range results.Next() { - record.Reset() - if err = record.Unmarshal(result.Value); err != nil { - // TODO log - continue - } - - id := record.Id.ID - if !record.clean(gc.ab.clock.Now()) { - continue - } - - if err := record.flush(batch); err != nil { - log.Warnf("failed to flush entry modified by GC for peer: &v, err: %v", id, err) - } - gc.ab.cache.Remove(id) - } - - if err = batch.Commit(context.TODO()); err != nil { - log.Warnf("failed to commit GC purge batch: %v", err) - } -} - -// populateLookahead populates the lookahead window by scanning the entire store and picking entries whose earliest -// expiration falls within the window period. -// -// Those entries are stored in the lookahead region in the store, indexed by the timestamp when they need to be -// visited, to facilitate temporal range scans. -func (gc *dsAddrBookGc) populateLookahead() { - if gc.ab.opts.GCLookaheadInterval == 0 { - return - } - - select { - case gc.running <- struct{}{}: - defer func() { <-gc.running }() - default: - // yield if something's running. - return - } - - until := gc.ab.clock.Now().Add(gc.ab.opts.GCLookaheadInterval).Unix() - - var id peer.ID - record := &addrsRecord{AddrBookRecord: &pb.AddrBookRecord{}} - results, err := gc.ab.ds.Query(context.TODO(), populateLookaheadQuery) - if err != nil { - log.Warnf("failed while querying to populate lookahead GC window: %v", err) - return - } - defer results.Close() - - batch, err := newCyclicBatch(gc.ab.ds, defaultOpsPerCyclicBatch) - if err != nil { - log.Warnf("failed while creating batch to populate lookahead GC window: %v", err) - return - } - - for result := range results.Next() { - idb32 := ds.RawKey(result.Key).Name() - k, err := b32.RawStdEncoding.DecodeString(idb32) - if err != nil { - log.Warnf("failed while decoding peer ID from key: %v, err: %v", result.Key, err) - continue - } - if id, err = peer.IDFromBytes(k); err != nil { - log.Warnf("failed while decoding peer ID from key: %v, err: %v", result.Key, err) - } - - // if the record is in cache, use the cached version. - if e, ok := gc.ab.cache.Peek(id); ok { - cached := e.(*addrsRecord) - cached.RLock() - if len(cached.Addrs) == 0 || cached.Addrs[0].Expiry > until { - cached.RUnlock() - continue - } - gcKey := gcLookaheadBase.ChildString(fmt.Sprintf("%d/%s", cached.Addrs[0].Expiry, idb32)) - if err = batch.Put(context.TODO(), gcKey, []byte{}); err != nil { - log.Warnf("failed while inserting GC entry for peer: %v, err: %v", id.Pretty(), err) - } - cached.RUnlock() - continue - } - - record.Reset() - - val, err := gc.ab.ds.Get(context.TODO(), ds.RawKey(result.Key)) - if err != nil { - log.Warnf("failed which getting record from store for peer: %v, err: %v", id.Pretty(), err) - continue - } - if err := record.Unmarshal(val); err != nil { - log.Warnf("failed while unmarshalling record from store for peer: %v, err: %v", id.Pretty(), err) - continue - } - if len(record.Addrs) > 0 && record.Addrs[0].Expiry <= until { - gcKey := gcLookaheadBase.ChildString(fmt.Sprintf("%d/%s", record.Addrs[0].Expiry, idb32)) - if err = batch.Put(context.TODO(), gcKey, []byte{}); err != nil { - log.Warnf("failed while inserting GC entry for peer: %v, err: %v", id.Pretty(), err) - } - } - } - - if err = batch.Commit(context.TODO()); err != nil { - log.Warnf("failed to commit GC lookahead batch: %v", err) - } - - gc.currWindowEnd = until -} - -// orderByTimestampInKey orders the results by comparing the timestamp in the -// key. A lexiographic sort by itself is wrong since "10" is less than "2", but -// as an int 2 is obviously less than 10. -func orderByTimestampInKey(a, b query.Entry) int { - aKey := ds.RawKey(a.Key) - aInt, err := strconv.ParseInt(aKey.Parent().Name(), 10, 64) - if err != nil { - return -1 - } - bKey := ds.RawKey(b.Key) - bInt, err := strconv.ParseInt(bKey.Parent().Name(), 10, 64) - if err != nil { - return -1 - } - if aInt < bInt { - return -1 - } else if aInt == bInt { - return 0 - } - return 1 -} diff --git a/pstoreds/addr_book_gc_test.go b/pstoreds/addr_book_gc_test.go deleted file mode 100644 index 3b4879f..0000000 --- a/pstoreds/addr_book_gc_test.go +++ /dev/null @@ -1,264 +0,0 @@ -package pstoreds - -import ( - "context" - "testing" - "time" - - mockClock "github.com/benbjohnson/clock" - "github.com/ipfs/go-datastore/query" - pstore "github.com/libp2p/go-libp2p-core/peerstore" - "github.com/libp2p/go-libp2p-peerstore/test" - ma "github.com/multiformats/go-multiaddr" - - "github.com/stretchr/testify/require" -) - -var lookaheadQuery = query.Query{Prefix: gcLookaheadBase.String(), KeysOnly: true} - -type testProbe struct { - t *testing.T - ab pstore.AddrBook -} - -func (tp *testProbe) countLookaheadEntries() (i int) { - results, err := tp.ab.(*dsAddrBook).ds.Query(context.Background(), lookaheadQuery) - if err != nil { - tp.t.Fatal(err) - } - - defer results.Close() - for range results.Next() { - i++ - } - return i -} - -func (tp *testProbe) clearCache() { - for _, k := range tp.ab.(*dsAddrBook).cache.Keys() { - tp.ab.(*dsAddrBook).cache.Remove(k) - } -} - -func TestGCLookahead(t *testing.T) { - opts := DefaultOpts() - - // effectively disable automatic GC for this test. - opts.GCInitialDelay = 90 * time.Hour - opts.GCLookaheadInterval = 10 * time.Second - opts.GCPurgeInterval = 1 * time.Second - - factory := addressBookFactory(t, leveldbStore, opts) - ab, closeFn := factory() - gc := ab.(*dsAddrBook).gc - defer closeFn() - - tp := &testProbe{t, ab} - - ids := test.GeneratePeerIDs(10) - addrs := test.GenerateAddrs(100) - - // lookahead is 10 seconds, so these entries will be outside the lookahead window. - ab.AddAddrs(ids[0], addrs[:10], time.Hour) - ab.AddAddrs(ids[1], addrs[10:20], time.Hour) - ab.AddAddrs(ids[2], addrs[20:30], time.Hour) - - gc.populateLookahead() - if i := tp.countLookaheadEntries(); i != 0 { - t.Errorf("expected no GC lookahead entries, got: %v", i) - } - - // change addresses of a peer to have TTL 1 second, placing them in the lookahead window. - ab.UpdateAddrs(ids[1], time.Hour, time.Second) - - // Purge the cache, to exercise a different path in the lookahead cycle. - tp.clearCache() - - gc.populateLookahead() - if i := tp.countLookaheadEntries(); i != 1 { - t.Errorf("expected 1 GC lookahead entry, got: %v", i) - } - - // change addresses of another to have TTL 5 second, placing them in the lookahead window. - ab.UpdateAddrs(ids[2], time.Hour, 5*time.Second) - gc.populateLookahead() - if i := tp.countLookaheadEntries(); i != 2 { - t.Errorf("expected 2 GC lookahead entries, got: %v", i) - } -} - -func TestGCPurging(t *testing.T) { - opts := DefaultOpts() - - // effectively disable automatic GC for this test. - opts.GCInitialDelay = 90 * time.Hour - opts.GCLookaheadInterval = 20 * time.Second - opts.GCPurgeInterval = 1 * time.Second - clk := mockClock.NewMock() - opts.Clock = clk - - factory := addressBookFactory(t, leveldbStore, opts) - ab, closeFn := factory() - gc := ab.(*dsAddrBook).gc - defer closeFn() - - tp := &testProbe{t, ab} - - ids := test.GeneratePeerIDs(10) - addrs := test.GenerateAddrs(100) - - // stagger addresses within the lookahead window, but stagger them. - ab.AddAddrs(ids[0], addrs[:10], 1*time.Second) - ab.AddAddrs(ids[1], addrs[30:40], 1*time.Second) - ab.AddAddrs(ids[2], addrs[60:70], 1*time.Second) - - ab.AddAddrs(ids[0], addrs[10:20], 4*time.Second) - ab.AddAddrs(ids[1], addrs[40:50], 4*time.Second) - - ab.AddAddrs(ids[0], addrs[20:30], 10*time.Second) - ab.AddAddrs(ids[1], addrs[50:60], 10*time.Second) - - // this is inside the window, but it will survive the purges we do in the test. - ab.AddAddrs(ids[3], addrs[70:80], 15*time.Second) - - gc.populateLookahead() - if i := tp.countLookaheadEntries(); i != 4 { - t.Errorf("expected 4 GC lookahead entries, got: %v", i) - } - - clk.Add(2 * time.Second) - gc.purgeLookahead() - if i := tp.countLookaheadEntries(); i != 3 { - t.Errorf("expected 3 GC lookahead entries, got: %v", i) - } - - // Purge the cache, to exercise a different path in the purge cycle. - tp.clearCache() - - clk.Add(5 * time.Second) - gc.purgeLookahead() - if i := tp.countLookaheadEntries(); i != 3 { - t.Errorf("expected 3 GC lookahead entries, got: %v", i) - } - - clk.Add(5 * time.Second) - gc.purgeLookahead() - if i := tp.countLookaheadEntries(); i != 1 { - t.Errorf("expected 1 GC lookahead entries, got: %v", i) - } - if i := len(ab.PeersWithAddrs()); i != 1 { - t.Errorf("expected 1 entries in database, got: %v", i) - } - if p := ab.PeersWithAddrs()[0]; p != ids[3] { - t.Errorf("expected remaining peer to be #3, got: %v, expected: %v", p, ids[3]) - } -} - -func TestGCDelay(t *testing.T) { - ids := test.GeneratePeerIDs(10) - addrs := test.GenerateAddrs(100) - - clk := mockClock.NewMock() - opts := DefaultOpts() - opts.GCInitialDelay = 2 * time.Second - opts.GCLookaheadInterval = 1 * time.Minute - opts.GCPurgeInterval = 30 * time.Second - opts.Clock = clk - - factory := addressBookFactory(t, leveldbStore, opts) - ab, closeFn := factory() - defer closeFn() - // give the background Go routine some time to start - time.Sleep(100 * time.Millisecond) - - tp := &testProbe{t, ab} - - ab.AddAddrs(ids[0], addrs, 1*time.Second) - - // immediately after we should be having no lookahead entries. - if i := tp.countLookaheadEntries(); i != 0 { - t.Fatalf("expected no lookahead entries, got: %d", i) - } - - // after the initial delay has passed. - clk.Add(3 * time.Second) - require.Eventually(t, func() bool { return tp.countLookaheadEntries() == 1 }, 3000*time.Millisecond, 10*time.Millisecond, "expected 1 lookahead entry") -} - -func TestGCLookaheadDisabled(t *testing.T) { - ids := test.GeneratePeerIDs(10) - addrs := test.GenerateAddrs(100) - - opts := DefaultOpts() - - // effectively disable automatic GC for this test. - opts.GCInitialDelay = 90 * time.Hour - opts.GCLookaheadInterval = 0 // disable lookahead - opts.GCPurgeInterval = 9 * time.Hour - clk := mockClock.NewMock() - opts.Clock = clk - - factory := addressBookFactory(t, leveldbStore, opts) - ab, closeFn := factory() - defer closeFn() - - tp := &testProbe{t, ab} - - // four peers: - // ids[0] has 10 addresses, all of which expire in 500ms. - // ids[1] has 20 addresses; 50% expire in 500ms and 50% in 10 hours. - // ids[2] has 10 addresses; all expire in 10 hours. - // ids[3] has 60 addresses; all expire in 10 hours. - ab.AddAddrs(ids[0], addrs[:10], 500*time.Millisecond) - ab.AddAddrs(ids[1], addrs[10:20], 500*time.Millisecond) - ab.AddAddrs(ids[1], addrs[20:30], 10*time.Hour) - ab.AddAddrs(ids[2], addrs[30:40], 10*time.Hour) - ab.AddAddrs(ids[3], addrs[40:], 10*time.Hour) - - clk.Add(100 * time.Millisecond) - - if i := tp.countLookaheadEntries(); i != 0 { - t.Errorf("expected no GC lookahead entries, got: %v", i) - } - - clk.Add(500 * time.Millisecond) - gc := ab.(*dsAddrBook).gc - gc.purgeFunc() - - var empty []ma.Multiaddr - test.AssertAddressesEqual(t, empty, ab.Addrs(ids[0])) - test.AssertAddressesEqual(t, addrs[20:30], ab.Addrs(ids[1])) - test.AssertAddressesEqual(t, addrs[30:40], ab.Addrs(ids[2])) - test.AssertAddressesEqual(t, addrs[40:], ab.Addrs(ids[3])) -} - -func BenchmarkLookaheadCycle(b *testing.B) { - ids := test.GeneratePeerIDs(100) - addrs := test.GenerateAddrs(100) - - opts := DefaultOpts() - - opts.GCInitialDelay = 2 * time.Hour - opts.GCLookaheadInterval = 2 * time.Hour - opts.GCPurgeInterval = 6 * time.Hour - - factory := addressBookFactory(b, leveldbStore, opts) - ab, closeFn := factory() - defer closeFn() - - inside, outside := 1*time.Minute, 48*time.Hour - for i, id := range ids { - var ttl time.Duration - if i%2 == 0 { - ttl = inside - } else { - ttl = outside - } - ab.AddAddrs(id, addrs, ttl) - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - ab.(*dsAddrBook).gc.populateLookahead() - } -} diff --git a/pstoreds/cache.go b/pstoreds/cache.go deleted file mode 100644 index d3d43aa..0000000 --- a/pstoreds/cache.go +++ /dev/null @@ -1,40 +0,0 @@ -package pstoreds - -// cache abstracts all methods we access from ARCCache, to enable alternate -// implementations such as a no-op one. -type cache interface { - Get(key interface{}) (value interface{}, ok bool) - Add(key, value interface{}) - Remove(key interface{}) - Contains(key interface{}) bool - Peek(key interface{}) (value interface{}, ok bool) - Keys() []interface{} -} - -// noopCache is a dummy implementation that's used when the cache is disabled. -type noopCache struct { -} - -var _ cache = (*noopCache)(nil) - -func (*noopCache) Get(key interface{}) (value interface{}, ok bool) { - return nil, false -} - -func (*noopCache) Add(key, value interface{}) { -} - -func (*noopCache) Remove(key interface{}) { -} - -func (*noopCache) Contains(key interface{}) bool { - return false -} - -func (*noopCache) Peek(key interface{}) (value interface{}, ok bool) { - return nil, false -} - -func (*noopCache) Keys() (keys []interface{}) { - return keys -} diff --git a/pstoreds/cyclic_batch.go b/pstoreds/cyclic_batch.go deleted file mode 100644 index 51f6afb..0000000 --- a/pstoreds/cyclic_batch.go +++ /dev/null @@ -1,78 +0,0 @@ -package pstoreds - -import ( - "context" - "errors" - "fmt" - - ds "github.com/ipfs/go-datastore" -) - -// how many operations are queued in a cyclic batch before we flush it. -var defaultOpsPerCyclicBatch = 20 - -// cyclicBatch buffers ds write operations and automatically flushes them after defaultOpsPerCyclicBatch (20) have been -// queued. An explicit `Commit()` closes this cyclic batch, erroring all further operations. -// -// It is similar to go-ds autobatch, but it's driven by an actual Batch facility offered by the -// ds. -type cyclicBatch struct { - threshold int - ds.Batch - ds ds.Batching - pending int -} - -func newCyclicBatch(ds ds.Batching, threshold int) (ds.Batch, error) { - batch, err := ds.Batch(context.TODO()) - if err != nil { - return nil, err - } - return &cyclicBatch{Batch: batch, ds: ds}, nil -} - -func (cb *cyclicBatch) cycle() (err error) { - if cb.Batch == nil { - return errors.New("cyclic batch is closed") - } - if cb.pending < cb.threshold { - // we haven't reached the threshold yet. - return nil - } - // commit and renew the batch. - if err = cb.Batch.Commit(context.TODO()); err != nil { - return fmt.Errorf("failed while committing cyclic batch: %w", err) - } - if cb.Batch, err = cb.ds.Batch(context.TODO()); err != nil { - return fmt.Errorf("failed while renewing cyclic batch: %w", err) - } - return nil -} - -func (cb *cyclicBatch) Put(ctx context.Context, key ds.Key, val []byte) error { - if err := cb.cycle(); err != nil { - return err - } - cb.pending++ - return cb.Batch.Put(ctx, key, val) -} - -func (cb *cyclicBatch) Delete(ctx context.Context, key ds.Key) error { - if err := cb.cycle(); err != nil { - return err - } - cb.pending++ - return cb.Batch.Delete(ctx, key) -} - -func (cb *cyclicBatch) Commit(ctx context.Context) error { - if cb.Batch == nil { - return errors.New("cyclic batch is closed") - } - if err := cb.Batch.Commit(ctx); err != nil { - return err - } - cb.pending = 0 - cb.Batch = nil - return nil -} diff --git a/pstoreds/ds_test.go b/pstoreds/ds_test.go deleted file mode 100644 index b848fd1..0000000 --- a/pstoreds/ds_test.go +++ /dev/null @@ -1,175 +0,0 @@ -package pstoreds - -import ( - "context" - "io/ioutil" - "os" - "testing" - "time" - - "github.com/stretchr/testify/require" - - ds "github.com/ipfs/go-datastore" - badger "github.com/ipfs/go-ds-badger" - leveldb "github.com/ipfs/go-ds-leveldb" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" - pt "github.com/libp2p/go-libp2p-peerstore/test" - - mockClock "github.com/benbjohnson/clock" -) - -type datastoreFactory func(tb testing.TB) (ds.Batching, func()) - -var dstores = map[string]datastoreFactory{ - //"Badger": badgerStore, - "Leveldb": leveldbStore, -} - -func TestDsPeerstore(t *testing.T) { - for name, dsFactory := range dstores { - t.Run(name, func(t *testing.T) { - pt.TestPeerstore(t, peerstoreFactory(t, dsFactory, DefaultOpts())) - }) - - t.Run("protobook limits", func(t *testing.T) { - const limit = 10 - opts := DefaultOpts() - opts.MaxProtocols = limit - ds, close := dsFactory(t) - defer close() - ps, err := NewPeerstore(context.Background(), ds, opts) - require.NoError(t, err) - defer ps.Close() - pt.TestPeerstoreProtoStoreLimits(t, ps, limit) - }) - } -} - -func TestDsAddrBook(t *testing.T) { - for name, dsFactory := range dstores { - t.Run(name+" Cacheful", func(t *testing.T) { - opts := DefaultOpts() - opts.GCPurgeInterval = 1 * time.Second - opts.CacheSize = 1024 - clk := mockClock.NewMock() - opts.Clock = clk - - pt.TestAddrBook(t, addressBookFactory(t, dsFactory, opts), clk) - }) - - t.Run(name+" Cacheless", func(t *testing.T) { - opts := DefaultOpts() - opts.GCPurgeInterval = 1 * time.Second - opts.CacheSize = 0 - clk := mockClock.NewMock() - opts.Clock = clk - - pt.TestAddrBook(t, addressBookFactory(t, dsFactory, opts), clk) - }) - } -} - -func TestDsKeyBook(t *testing.T) { - for name, dsFactory := range dstores { - t.Run(name, func(t *testing.T) { - pt.TestKeyBook(t, keyBookFactory(t, dsFactory, DefaultOpts())) - }) - } -} - -func BenchmarkDsKeyBook(b *testing.B) { - for name, dsFactory := range dstores { - b.Run(name, func(b *testing.B) { - pt.BenchmarkKeyBook(b, keyBookFactory(b, dsFactory, DefaultOpts())) - }) - } -} - -func BenchmarkDsPeerstore(b *testing.B) { - caching := DefaultOpts() - caching.CacheSize = 1024 - - cacheless := DefaultOpts() - cacheless.CacheSize = 0 - - for name, dsFactory := range dstores { - b.Run(name, func(b *testing.B) { - pt.BenchmarkPeerstore(b, peerstoreFactory(b, dsFactory, caching), "Caching") - }) - b.Run(name, func(b *testing.B) { - pt.BenchmarkPeerstore(b, peerstoreFactory(b, dsFactory, cacheless), "Cacheless") - }) - } -} - -// Doesn't work on 32bit because badger. -//lint:ignore U1000 disabled for now -func badgerStore(tb testing.TB) (ds.Batching, func()) { - dataPath, err := ioutil.TempDir(os.TempDir(), "badger") - if err != nil { - tb.Fatal(err) - } - store, err := badger.NewDatastore(dataPath, nil) - if err != nil { - tb.Fatal(err) - } - closer := func() { - store.Close() - os.RemoveAll(dataPath) - } - return store, closer -} - -func leveldbStore(tb testing.TB) (ds.Batching, func()) { - // Intentionally test in-memory because disks suck, especially in CI. - store, err := leveldb.NewDatastore("", nil) - if err != nil { - tb.Fatal(err) - } - closer := func() { - store.Close() - } - return store, closer -} - -func peerstoreFactory(tb testing.TB, storeFactory datastoreFactory, opts Options) pt.PeerstoreFactory { - return func() (pstore.Peerstore, func()) { - store, storeCloseFn := storeFactory(tb) - ps, err := NewPeerstore(context.Background(), store, opts) - if err != nil { - tb.Fatal(err) - } - closer := func() { - ps.Close() - storeCloseFn() - } - return ps, closer - } -} - -func addressBookFactory(tb testing.TB, storeFactory datastoreFactory, opts Options) pt.AddrBookFactory { - return func() (pstore.AddrBook, func()) { - store, closeFunc := storeFactory(tb) - ab, err := NewAddrBook(context.Background(), store, opts) - if err != nil { - tb.Fatal(err) - } - closer := func() { - ab.Close() - closeFunc() - } - return ab, closer - } -} - -func keyBookFactory(tb testing.TB, storeFactory datastoreFactory, opts Options) pt.KeyBookFactory { - return func() (pstore.KeyBook, func()) { - store, storeCloseFn := storeFactory(tb) - kb, err := NewKeyBook(context.Background(), store, opts) - if err != nil { - tb.Fatal(err) - } - return kb, storeCloseFn - } -} diff --git a/pstoreds/keybook.go b/pstoreds/keybook.go index 7ee06c8..c47472d 100644 --- a/pstoreds/keybook.go +++ b/pstoreds/keybook.go @@ -2,136 +2,13 @@ package pstoreds import ( "context" - "errors" - - "github.com/multiformats/go-base32" ds "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/query" - - ic "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ) -// Public and private keys are stored under the following db key pattern: -// /peers/keys//{pub, priv} -var ( - kbBase = ds.NewKey("/peers/keys") - pubSuffix = ds.NewKey("/pub") - privSuffix = ds.NewKey("/priv") -) - -type dsKeyBook struct { - ds ds.Datastore -} - -var _ pstore.KeyBook = (*dsKeyBook)(nil) - -func NewKeyBook(_ context.Context, store ds.Datastore, _ Options) (*dsKeyBook, error) { - return &dsKeyBook{store}, nil -} - -func (kb *dsKeyBook) PubKey(p peer.ID) ic.PubKey { - key := peerToKey(p, pubSuffix) - - var pk ic.PubKey - if value, err := kb.ds.Get(context.TODO(), key); err == nil { - pk, err = ic.UnmarshalPublicKey(value) - if err != nil { - log.Errorf("error when unmarshalling pubkey from datastore for peer %s: %s\n", p.Pretty(), err) - } - } else if err == ds.ErrNotFound { - pk, err = p.ExtractPublicKey() - switch err { - case nil: - case peer.ErrNoPublicKey: - return nil - default: - log.Errorf("error when extracting pubkey from peer ID for peer %s: %s\n", p.Pretty(), err) - return nil - } - pkb, err := ic.MarshalPublicKey(pk) - if err != nil { - log.Errorf("error when turning extracted pubkey into bytes for peer %s: %s\n", p.Pretty(), err) - return nil - } - if err := kb.ds.Put(context.TODO(), key, pkb); err != nil { - log.Errorf("error when adding extracted pubkey to peerstore for peer %s: %s\n", p.Pretty(), err) - return nil - } - } else { - log.Errorf("error when fetching pubkey from datastore for peer %s: %s\n", p.Pretty(), err) - } - - return pk -} - -func (kb *dsKeyBook) AddPubKey(p peer.ID, pk ic.PubKey) error { - // check it's correct. - if !p.MatchesPublicKey(pk) { - return errors.New("peer ID does not match public key") - } - - val, err := ic.MarshalPublicKey(pk) - if err != nil { - log.Errorf("error while converting pubkey byte string for peer %s: %s\n", p.Pretty(), err) - return err - } - if err := kb.ds.Put(context.TODO(), peerToKey(p, pubSuffix), val); err != nil { - log.Errorf("error while updating pubkey in datastore for peer %s: %s\n", p.Pretty(), err) - return err - } - return nil -} - -func (kb *dsKeyBook) PrivKey(p peer.ID) ic.PrivKey { - value, err := kb.ds.Get(context.TODO(), peerToKey(p, privSuffix)) - if err != nil { - return nil - } - sk, err := ic.UnmarshalPrivateKey(value) - if err != nil { - return nil - } - return sk -} - -func (kb *dsKeyBook) AddPrivKey(p peer.ID, sk ic.PrivKey) error { - if sk == nil { - return errors.New("private key is nil") - } - // check it's correct. - if !p.MatchesPrivateKey(sk) { - return errors.New("peer ID does not match private key") - } - - val, err := ic.MarshalPrivateKey(sk) - if err != nil { - log.Errorf("error while converting privkey byte string for peer %s: %s\n", p.Pretty(), err) - return err - } - if err := kb.ds.Put(context.TODO(), peerToKey(p, privSuffix), val); err != nil { - log.Errorf("error while updating privkey in datastore for peer %s: %s\n", p.Pretty(), err) - } - return err -} - -func (kb *dsKeyBook) PeersWithKeys() peer.IDSlice { - ids, err := uniquePeerIds(kb.ds, kbBase, func(result query.Result) string { - return ds.RawKey(result.Key).Parent().Name() - }) - if err != nil { - log.Errorf("error while retrieving peers with keys: %v", err) - } - return ids -} - -func (kb *dsKeyBook) RemovePeer(p peer.ID) { - kb.ds.Delete(context.TODO(), peerToKey(p, privSuffix)) - kb.ds.Delete(context.TODO(), peerToKey(p, pubSuffix)) -} - -func peerToKey(p peer.ID, suffix ds.Key) ds.Key { - return kbBase.ChildString(base32.RawStdEncoding.EncodeToString([]byte(p))).Child(suffix) +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.NewKeyBook instead +func NewKeyBook(ctx context.Context, store ds.Datastore, opts Options) (pstore.KeyBook, error) { + return pstoreds.NewKeyBook(ctx, store, opts) } diff --git a/pstoreds/metadata.go b/pstoreds/metadata.go index 1420173..ad976c4 100644 --- a/pstoreds/metadata.go +++ b/pstoreds/metadata.go @@ -1,81 +1,20 @@ package pstoreds import ( - "bytes" "context" - "encoding/gob" - pool "github.com/libp2p/go-buffer-pool" - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ds "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/query" - "github.com/multiformats/go-base32" ) -// Metadata is stored under the following db key pattern: -// /peers/metadata// -var pmBase = ds.NewKey("/peers/metadata") - -type dsPeerMetadata struct { - ds ds.Datastore -} - -var _ pstore.PeerMetadata = (*dsPeerMetadata)(nil) - -func init() { - // Gob registers basic types by default. - // - // Register complex types used by the peerstore itself. - gob.Register(make(map[string]struct{})) -} - // NewPeerMetadata creates a metadata store backed by a persistent db. It uses gob for serialisation. // // See `init()` to learn which types are registered by default. Modules wishing to store // values of other types will need to `gob.Register()` them explicitly, or else callers // will receive runtime errors. -func NewPeerMetadata(_ context.Context, store ds.Datastore, _ Options) (*dsPeerMetadata, error) { - return &dsPeerMetadata{store}, nil -} - -func (pm *dsPeerMetadata) Get(p peer.ID, key string) (interface{}, error) { - k := pmBase.ChildString(base32.RawStdEncoding.EncodeToString([]byte(p))).ChildString(key) - value, err := pm.ds.Get(context.TODO(), k) - if err != nil { - if err == ds.ErrNotFound { - err = pstore.ErrNotFound - } - return nil, err - } - - var res interface{} - if err := gob.NewDecoder(bytes.NewReader(value)).Decode(&res); err != nil { - return nil, err - } - return res, nil -} - -func (pm *dsPeerMetadata) Put(p peer.ID, key string, val interface{}) error { - k := pmBase.ChildString(base32.RawStdEncoding.EncodeToString([]byte(p))).ChildString(key) - var buf pool.Buffer - if err := gob.NewEncoder(&buf).Encode(&val); err != nil { - return err - } - return pm.ds.Put(context.TODO(), k, buf.Bytes()) -} - -func (pm *dsPeerMetadata) RemovePeer(p peer.ID) { - result, err := pm.ds.Query(context.TODO(), query.Query{ - Prefix: pmBase.ChildString(base32.RawStdEncoding.EncodeToString([]byte(p))).String(), - KeysOnly: true, - }) - if err != nil { - log.Warnw("querying datastore when removing peer failed", "peer", p, "error", err) - return - } - for entry := range result.Next() { - pm.ds.Delete(context.TODO(), ds.NewKey(entry.Key)) - } +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.NewPeerMetadata instead +func NewPeerMetadata(ctx context.Context, store ds.Datastore, opts Options) (pstore.PeerMetadata, error) { + return pstoreds.NewPeerMetadata(ctx, store, opts) } diff --git a/pstoreds/peerstore.go b/pstoreds/peerstore.go index 3119be3..258a069 100644 --- a/pstoreds/peerstore.go +++ b/pstoreds/peerstore.go @@ -1,42 +1,18 @@ +// Deprecated: This package has moved into go-libp2p as a sub-package: github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds. package pstoreds import ( "context" - "fmt" - "io" - "time" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" - pstore "github.com/libp2p/go-libp2p-peerstore" + "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ds "github.com/ipfs/go-datastore" - "github.com/ipfs/go-datastore/query" - "github.com/multiformats/go-base32" ) // Configuration object for the peerstore. -type Options struct { - // The size of the in-memory cache. A value of 0 or lower disables the cache. - CacheSize uint - - // MaxProtocols is the maximum number of protocols we store for one peer. - MaxProtocols int - - // Sweep interval to purge expired addresses from the datastore. If this is a zero value, GC will not run - // automatically, but it'll be available on demand via explicit calls. - GCPurgeInterval time.Duration - - // Interval to renew the GC lookahead window. If this is a zero value, lookahead will be disabled and we'll - // traverse the entire datastore for every purge cycle. - GCLookaheadInterval time.Duration - - // Initial delay before GC processes start. Intended to give the system breathing room to fully boot - // before starting GC. - GCInitialDelay time.Duration - - Clock clock -} +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.Options instead +type Options = pstoreds.Options // DefaultOpts returns the default options for a persistent peerstore, with the full-purge GC algorithm: // @@ -45,147 +21,15 @@ type Options struct { // * GC purge interval: 2 hours. // * GC lookahead interval: disabled. // * GC initial delay: 60 seconds. +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.DefaultOpts instead func DefaultOpts() Options { - return Options{ - CacheSize: 1024, - MaxProtocols: 1024, - GCPurgeInterval: 2 * time.Hour, - GCLookaheadInterval: 0, - GCInitialDelay: 60 * time.Second, - Clock: realclock{}, - } + return pstoreds.DefaultOpts() } -type pstoreds struct { - peerstore.Metrics - - *dsKeyBook - *dsAddrBook - *dsProtoBook - *dsPeerMetadata -} - -var _ peerstore.Peerstore = &pstoreds{} - // NewPeerstore creates a peerstore backed by the provided persistent datastore. // It's the caller's responsibility to call RemovePeer to ensure // that memory consumption of the peerstore doesn't grow unboundedly. -func NewPeerstore(ctx context.Context, store ds.Batching, opts Options) (*pstoreds, error) { - addrBook, err := NewAddrBook(ctx, store, opts) - if err != nil { - return nil, err - } - - keyBook, err := NewKeyBook(ctx, store, opts) - if err != nil { - return nil, err - } - - peerMetadata, err := NewPeerMetadata(ctx, store, opts) - if err != nil { - return nil, err - } - - protoBook, err := NewProtoBook(peerMetadata, WithMaxProtocols(opts.MaxProtocols)) - if err != nil { - return nil, err - } - - return &pstoreds{ - Metrics: pstore.NewMetrics(), - dsKeyBook: keyBook, - dsAddrBook: addrBook, - dsPeerMetadata: peerMetadata, - dsProtoBook: protoBook, - }, nil -} - -// uniquePeerIds extracts and returns unique peer IDs from database keys. -func uniquePeerIds(ds ds.Datastore, prefix ds.Key, extractor func(result query.Result) string) (peer.IDSlice, error) { - var ( - q = query.Query{Prefix: prefix.String(), KeysOnly: true} - results query.Results - err error - ) - - if results, err = ds.Query(context.TODO(), q); err != nil { - log.Error(err) - return nil, err - } - - defer results.Close() - - idset := make(map[string]struct{}) - for result := range results.Next() { - k := extractor(result) - idset[k] = struct{}{} - } - - if len(idset) == 0 { - return peer.IDSlice{}, nil - } - - ids := make(peer.IDSlice, 0, len(idset)) - for id := range idset { - pid, _ := base32.RawStdEncoding.DecodeString(id) - id, _ := peer.IDFromBytes(pid) - ids = append(ids, id) - } - return ids, nil -} - -func (ps *pstoreds) Close() (err error) { - var errs []error - weakClose := func(name string, c interface{}) { - if cl, ok := c.(io.Closer); ok { - if err = cl.Close(); err != nil { - errs = append(errs, fmt.Errorf("%s error: %s", name, err)) - } - } - } - weakClose("keybook", ps.dsKeyBook) - weakClose("addressbook", ps.dsAddrBook) - weakClose("protobook", ps.dsProtoBook) - weakClose("peermetadata", ps.dsPeerMetadata) - - if len(errs) > 0 { - return fmt.Errorf("failed while closing peerstore; err(s): %q", errs) - } - return nil -} - -func (ps *pstoreds) Peers() peer.IDSlice { - set := map[peer.ID]struct{}{} - for _, p := range ps.PeersWithKeys() { - set[p] = struct{}{} - } - for _, p := range ps.PeersWithAddrs() { - set[p] = struct{}{} - } - - pps := make(peer.IDSlice, 0, len(set)) - for p := range set { - pps = append(pps, p) - } - return pps -} - -func (ps *pstoreds) PeerInfo(p peer.ID) peer.AddrInfo { - return peer.AddrInfo{ - ID: p, - Addrs: ps.dsAddrBook.Addrs(p), - } -} - -// RemovePeer removes entries associated with a peer from: -// * the KeyBook -// * the ProtoBook -// * the PeerMetadata -// * the Metrics -// It DOES NOT remove the peer from the AddrBook. -func (ps *pstoreds) RemovePeer(p peer.ID) { - ps.dsKeyBook.RemovePeer(p) - ps.dsProtoBook.RemovePeer(p) - ps.dsPeerMetadata.RemovePeer(p) - ps.Metrics.RemovePeer(p) +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.NewPeerstore instead +func NewPeerstore(ctx context.Context, store ds.Batching, opts Options) (peerstore.Peerstore, error) { + return pstoreds.NewPeerstore(ctx, store, opts) } diff --git a/pstoreds/protobook.go b/pstoreds/protobook.go index af44722..5eeef75 100644 --- a/pstoreds/protobook.go +++ b/pstoreds/protobook.go @@ -1,196 +1,20 @@ package pstoreds import ( - "errors" - "fmt" - "sync" - - "github.com/libp2p/go-libp2p-core/peer" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" + "github.com/libp2p/go-libp2p/core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds" ) -type protoSegment struct { - sync.RWMutex -} - -type protoSegments [256]*protoSegment - -func (s *protoSegments) get(p peer.ID) *protoSegment { - return s[byte(p[len(p)-1])] -} - -var errTooManyProtocols = errors.New("too many protocols") - -type ProtoBookOption func(*dsProtoBook) error +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.ProtoBookOption instead +type ProtoBookOption = pstoreds.ProtoBookOption +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.WithMaxProtocols instead func WithMaxProtocols(num int) ProtoBookOption { - return func(pb *dsProtoBook) error { - pb.maxProtos = num - return nil - } + return pstoreds.WithMaxProtocols(num) } -type dsProtoBook struct { - segments protoSegments - meta pstore.PeerMetadata - maxProtos int -} - -var _ pstore.ProtoBook = (*dsProtoBook)(nil) - -func NewProtoBook(meta pstore.PeerMetadata, opts ...ProtoBookOption) (*dsProtoBook, error) { - pb := &dsProtoBook{ - meta: meta, - segments: func() (ret protoSegments) { - for i := range ret { - ret[i] = &protoSegment{} - } - return ret - }(), - maxProtos: 1024, - } - - for _, opt := range opts { - if err := opt(pb); err != nil { - return nil, err - } - } - return pb, nil -} - -func (pb *dsProtoBook) SetProtocols(p peer.ID, protos ...string) error { - if len(protos) > pb.maxProtos { - return errTooManyProtocols - } - - protomap := make(map[string]struct{}, len(protos)) - for _, proto := range protos { - protomap[proto] = struct{}{} - } - - s := pb.segments.get(p) - s.Lock() - defer s.Unlock() - - return pb.meta.Put(p, "protocols", protomap) -} - -func (pb *dsProtoBook) AddProtocols(p peer.ID, protos ...string) error { - s := pb.segments.get(p) - s.Lock() - defer s.Unlock() - - pmap, err := pb.getProtocolMap(p) - if err != nil { - return err - } - if len(pmap)+len(protos) > pb.maxProtos { - return errTooManyProtocols - } - - for _, proto := range protos { - pmap[proto] = struct{}{} - } - - return pb.meta.Put(p, "protocols", pmap) -} - -func (pb *dsProtoBook) GetProtocols(p peer.ID) ([]string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - pmap, err := pb.getProtocolMap(p) - if err != nil { - return nil, err - } - - res := make([]string, 0, len(pmap)) - for proto := range pmap { - res = append(res, proto) - } - - return res, nil -} - -func (pb *dsProtoBook) SupportsProtocols(p peer.ID, protos ...string) ([]string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - pmap, err := pb.getProtocolMap(p) - if err != nil { - return nil, err - } - - res := make([]string, 0, len(protos)) - for _, proto := range protos { - if _, ok := pmap[proto]; ok { - res = append(res, proto) - } - } - - return res, nil -} - -func (pb *dsProtoBook) FirstSupportedProtocol(p peer.ID, protos ...string) (string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - pmap, err := pb.getProtocolMap(p) - if err != nil { - return "", err - } - for _, proto := range protos { - if _, ok := pmap[proto]; ok { - return proto, nil - } - } - - return "", nil -} - -func (pb *dsProtoBook) RemoveProtocols(p peer.ID, protos ...string) error { - s := pb.segments.get(p) - s.Lock() - defer s.Unlock() - - pmap, err := pb.getProtocolMap(p) - if err != nil { - return err - } - - if len(pmap) == 0 { - // nothing to do. - return nil - } - - for _, proto := range protos { - delete(pmap, proto) - } - - return pb.meta.Put(p, "protocols", pmap) -} - -func (pb *dsProtoBook) getProtocolMap(p peer.ID) (map[string]struct{}, error) { - iprotomap, err := pb.meta.Get(p, "protocols") - switch err { - default: - return nil, err - case pstore.ErrNotFound: - return make(map[string]struct{}), nil - case nil: - cast, ok := iprotomap.(map[string]struct{}) - if !ok { - return nil, fmt.Errorf("stored protocol set was not a map") - } - - return cast, nil - } -} - -func (pb *dsProtoBook) RemovePeer(p peer.ID) { - pb.meta.RemovePeer(p) +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds.NewProtoBook instead +func NewProtoBook(meta pstore.PeerMetadata, opts ...ProtoBookOption) (peerstore.ProtoBook, error) { + return pstoreds.NewProtoBook(meta, opts...) } diff --git a/pstoremem/addr_book.go b/pstoremem/addr_book.go index 7e6a67f..1912e27 100644 --- a/pstoremem/addr_book.go +++ b/pstoremem/addr_book.go @@ -1,517 +1,36 @@ package pstoremem import ( - "context" - "fmt" - "sort" - "sync" "time" - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" - "github.com/libp2p/go-libp2p-core/record" - - logging "github.com/ipfs/go-log/v2" - ma "github.com/multiformats/go-multiaddr" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem" ) -var log = logging.Logger("peerstore") - -type expiringAddr struct { - Addr ma.Multiaddr - TTL time.Duration - Expires time.Time +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewAddrBook instead +func NewAddrBook() pstore.AddrBook { + return pstoremem.NewAddrBook() } -func (e *expiringAddr) ExpiredBy(t time.Time) bool { - return !t.Before(e.Expires) -} - -type peerRecordState struct { - Envelope *record.Envelope - Seq uint64 -} - -type addrSegments [256]*addrSegment - -type addrSegment struct { - sync.RWMutex - - // Use pointers to save memory. Maps always leave some fraction of their - // space unused. storing the *values* directly in the map will - // drastically increase the space waste. In our case, by 6x. - addrs map[peer.ID]map[string]*expiringAddr - - signedPeerRecords map[peer.ID]*peerRecordState -} - -func (segments *addrSegments) get(p peer.ID) *addrSegment { - return segments[byte(p[len(p)-1])] -} +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.AddrBookOption instead +type AddrBookOption = pstoremem.AddrBookOption type clock interface { Now() time.Time } -type realclock struct{} - -func (rc realclock) Now() time.Time { - return time.Now() -} - -// memoryAddrBook manages addresses. -type memoryAddrBook struct { - segments addrSegments - - refCount sync.WaitGroup - cancel func() - - subManager *AddrSubManager - clock clock -} - -var _ pstore.AddrBook = (*memoryAddrBook)(nil) -var _ pstore.CertifiedAddrBook = (*memoryAddrBook)(nil) - -func NewAddrBook() *memoryAddrBook { - ctx, cancel := context.WithCancel(context.Background()) - - ab := &memoryAddrBook{ - segments: func() (ret addrSegments) { - for i := range ret { - ret[i] = &addrSegment{ - addrs: make(map[peer.ID]map[string]*expiringAddr), - signedPeerRecords: make(map[peer.ID]*peerRecordState)} - } - return ret - }(), - subManager: NewAddrSubManager(), - cancel: cancel, - clock: realclock{}, - } - ab.refCount.Add(1) - go ab.background(ctx) - return ab -} - -type AddrBookOption func(book *memoryAddrBook) error - +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.WithClock instead func WithClock(clock clock) AddrBookOption { - return func(book *memoryAddrBook) error { - book.clock = clock - return nil - } -} - -// background periodically schedules a gc -func (mab *memoryAddrBook) background(ctx context.Context) { - defer mab.refCount.Done() - ticker := time.NewTicker(1 * time.Hour) - defer ticker.Stop() - - for { - select { - case <-ticker.C: - mab.gc() - case <-ctx.Done(): - return - } - } -} - -func (mab *memoryAddrBook) Close() error { - mab.cancel() - mab.refCount.Wait() - return nil -} - -// gc garbage collects the in-memory address book. -func (mab *memoryAddrBook) gc() { - now := mab.clock.Now() - for _, s := range mab.segments { - s.Lock() - for p, amap := range s.addrs { - for k, addr := range amap { - if addr.ExpiredBy(now) { - delete(amap, k) - } - } - if len(amap) == 0 { - delete(s.addrs, p) - delete(s.signedPeerRecords, p) - } - } - s.Unlock() - } -} - -func (mab *memoryAddrBook) PeersWithAddrs() peer.IDSlice { - // deduplicate, since the same peer could have both signed & unsigned addrs - set := make(map[peer.ID]struct{}) - for _, s := range mab.segments { - s.RLock() - for pid, amap := range s.addrs { - if len(amap) > 0 { - set[pid] = struct{}{} - } - } - s.RUnlock() - } - peers := make(peer.IDSlice, 0, len(set)) - for pid := range set { - peers = append(peers, pid) - } - return peers -} - -// AddAddr calls AddAddrs(p, []ma.Multiaddr{addr}, ttl) -func (mab *memoryAddrBook) AddAddr(p peer.ID, addr ma.Multiaddr, ttl time.Duration) { - mab.AddAddrs(p, []ma.Multiaddr{addr}, ttl) -} - -// AddAddrs gives memoryAddrBook addresses to use, with a given ttl -// (time-to-live), after which the address is no longer valid. -// This function never reduces the TTL or expiration of an address. -func (mab *memoryAddrBook) AddAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) { - // if we have a valid peer record, ignore unsigned addrs - // peerRec := mab.GetPeerRecord(p) - // if peerRec != nil { - // return - // } - mab.addAddrs(p, addrs, ttl) -} - -// ConsumePeerRecord adds addresses from a signed peer.PeerRecord (contained in -// a record.Envelope), which will expire after the given TTL. -// See https://godoc.org/github.com/libp2p/go-libp2p-core/peerstore#CertifiedAddrBook for more details. -func (mab *memoryAddrBook) ConsumePeerRecord(recordEnvelope *record.Envelope, ttl time.Duration) (bool, error) { - r, err := recordEnvelope.Record() - if err != nil { - return false, err - } - rec, ok := r.(*peer.PeerRecord) - if !ok { - return false, fmt.Errorf("unable to process envelope: not a PeerRecord") - } - if !rec.PeerID.MatchesPublicKey(recordEnvelope.PublicKey) { - return false, fmt.Errorf("signing key does not match PeerID in PeerRecord") - } - - // ensure seq is greater than, or equal to, the last received - s := mab.segments.get(rec.PeerID) - s.Lock() - defer s.Unlock() - lastState, found := s.signedPeerRecords[rec.PeerID] - if found && lastState.Seq > rec.Seq { - return false, nil - } - s.signedPeerRecords[rec.PeerID] = &peerRecordState{ - Envelope: recordEnvelope, - Seq: rec.Seq, - } - mab.addAddrsUnlocked(s, rec.PeerID, rec.Addrs, ttl, true) - return true, nil -} - -func (mab *memoryAddrBook) addAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) { - s := mab.segments.get(p) - s.Lock() - defer s.Unlock() - - mab.addAddrsUnlocked(s, p, addrs, ttl, false) -} - -func (mab *memoryAddrBook) addAddrsUnlocked(s *addrSegment, p peer.ID, addrs []ma.Multiaddr, ttl time.Duration, signed bool) { - // if ttl is zero, exit. nothing to do. - if ttl <= 0 { - return - } - - amap, ok := s.addrs[p] - if !ok { - amap = make(map[string]*expiringAddr) - s.addrs[p] = amap - } - - exp := mab.clock.Now().Add(ttl) - for _, addr := range addrs { - if addr == nil { - log.Warnw("was passed nil multiaddr", "peer", p) - continue - } - - // find the highest TTL and Expiry time between - // existing records and function args - a, found := amap[string(addr.Bytes())] // won't allocate. - if !found { - // not found, announce it. - entry := &expiringAddr{Addr: addr, Expires: exp, TTL: ttl} - amap[string(addr.Bytes())] = entry - mab.subManager.BroadcastAddr(p, addr) - } else { - // update ttl & exp to whichever is greater between new and existing entry - if ttl > a.TTL { - a.TTL = ttl - } - if exp.After(a.Expires) { - a.Expires = exp - } - } - } -} - -// SetAddr calls mgr.SetAddrs(p, addr, ttl) -func (mab *memoryAddrBook) SetAddr(p peer.ID, addr ma.Multiaddr, ttl time.Duration) { - mab.SetAddrs(p, []ma.Multiaddr{addr}, ttl) -} - -// SetAddrs sets the ttl on addresses. This clears any TTL there previously. -// This is used when we receive the best estimate of the validity of an address. -func (mab *memoryAddrBook) SetAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Duration) { - s := mab.segments.get(p) - s.Lock() - defer s.Unlock() - - amap, ok := s.addrs[p] - if !ok { - amap = make(map[string]*expiringAddr) - s.addrs[p] = amap - } - - exp := mab.clock.Now().Add(ttl) - for _, addr := range addrs { - if addr == nil { - log.Warnw("was passed nil multiaddr", "peer", p) - continue - } - aBytes := addr.Bytes() - key := string(aBytes) - - // re-set all of them for new ttl. - if ttl > 0 { - amap[key] = &expiringAddr{Addr: addr, Expires: exp, TTL: ttl} - mab.subManager.BroadcastAddr(p, addr) - } else { - delete(amap, key) - } - } -} - -// UpdateAddrs updates the addresses associated with the given peer that have -// the given oldTTL to have the given newTTL. -func (mab *memoryAddrBook) UpdateAddrs(p peer.ID, oldTTL time.Duration, newTTL time.Duration) { - s := mab.segments.get(p) - s.Lock() - defer s.Unlock() - exp := mab.clock.Now().Add(newTTL) - amap, found := s.addrs[p] - if !found { - return - } - - for k, a := range amap { - if oldTTL == a.TTL { - if newTTL == 0 { - delete(amap, k) - } else { - a.TTL = newTTL - a.Expires = exp - amap[k] = a - } - } - } -} - -// Addrs returns all known (and valid) addresses for a given peer -func (mab *memoryAddrBook) Addrs(p peer.ID) []ma.Multiaddr { - s := mab.segments.get(p) - s.RLock() - defer s.RUnlock() - - return validAddrs(mab.clock.Now(), s.addrs[p]) -} - -func validAddrs(now time.Time, amap map[string]*expiringAddr) []ma.Multiaddr { - good := make([]ma.Multiaddr, 0, len(amap)) - if amap == nil { - return good - } - for _, m := range amap { - if !m.ExpiredBy(now) { - good = append(good, m.Addr) - } - } - - return good -} - -// GetPeerRecord returns a Envelope containing a PeerRecord for the -// given peer id, if one exists. -// Returns nil if no signed PeerRecord exists for the peer. -func (mab *memoryAddrBook) GetPeerRecord(p peer.ID) *record.Envelope { - s := mab.segments.get(p) - s.RLock() - defer s.RUnlock() - - // although the signed record gets garbage collected when all addrs inside it are expired, - // we may be in between the expiration time and the GC interval - // so, we check to see if we have any valid signed addrs before returning the record - if len(validAddrs(mab.clock.Now(), s.addrs[p])) == 0 { - return nil - } - - state := s.signedPeerRecords[p] - if state == nil { - return nil - } - return state.Envelope -} - -// ClearAddrs removes all previously stored addresses -func (mab *memoryAddrBook) ClearAddrs(p peer.ID) { - s := mab.segments.get(p) - s.Lock() - defer s.Unlock() - - delete(s.addrs, p) - delete(s.signedPeerRecords, p) -} - -// AddrStream returns a channel on which all new addresses discovered for a -// given peer ID will be published. -func (mab *memoryAddrBook) AddrStream(ctx context.Context, p peer.ID) <-chan ma.Multiaddr { - s := mab.segments.get(p) - s.RLock() - defer s.RUnlock() - - baseaddrslice := s.addrs[p] - initial := make([]ma.Multiaddr, 0, len(baseaddrslice)) - for _, a := range baseaddrslice { - initial = append(initial, a.Addr) - } - - return mab.subManager.AddrStream(ctx, p, initial) -} - -type addrSub struct { - pubch chan ma.Multiaddr - ctx context.Context -} - -func (s *addrSub) pubAddr(a ma.Multiaddr) { - select { - case s.pubch <- a: - case <-s.ctx.Done(): - } + return pstoremem.WithClock(clock) } // An abstracted, pub-sub manager for address streams. Extracted from // memoryAddrBook in order to support additional implementations. -type AddrSubManager struct { - mu sync.RWMutex - subs map[peer.ID][]*addrSub -} +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.AddrSubManager instead +type AddrSubManager = pstoremem.AddrSubManager // NewAddrSubManager initializes an AddrSubManager. +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewAddrSubManager instead func NewAddrSubManager() *AddrSubManager { - return &AddrSubManager{ - subs: make(map[peer.ID][]*addrSub), - } -} - -// Used internally by the address stream coroutine to remove a subscription -// from the manager. -func (mgr *AddrSubManager) removeSub(p peer.ID, s *addrSub) { - mgr.mu.Lock() - defer mgr.mu.Unlock() - - subs := mgr.subs[p] - if len(subs) == 1 { - if subs[0] != s { - return - } - delete(mgr.subs, p) - return - } - - for i, v := range subs { - if v == s { - subs[i] = subs[len(subs)-1] - subs[len(subs)-1] = nil - mgr.subs[p] = subs[:len(subs)-1] - return - } - } -} - -// BroadcastAddr broadcasts a new address to all subscribed streams. -func (mgr *AddrSubManager) BroadcastAddr(p peer.ID, addr ma.Multiaddr) { - mgr.mu.RLock() - defer mgr.mu.RUnlock() - - if subs, ok := mgr.subs[p]; ok { - for _, sub := range subs { - sub.pubAddr(addr) - } - } -} - -// AddrStream creates a new subscription for a given peer ID, pre-populating the -// channel with any addresses we might already have on file. -func (mgr *AddrSubManager) AddrStream(ctx context.Context, p peer.ID, initial []ma.Multiaddr) <-chan ma.Multiaddr { - sub := &addrSub{pubch: make(chan ma.Multiaddr), ctx: ctx} - out := make(chan ma.Multiaddr) - - mgr.mu.Lock() - mgr.subs[p] = append(mgr.subs[p], sub) - mgr.mu.Unlock() - - sort.Sort(addrList(initial)) - - go func(buffer []ma.Multiaddr) { - defer close(out) - - sent := make(map[string]struct{}, len(buffer)) - for _, a := range buffer { - sent[string(a.Bytes())] = struct{}{} - } - - var outch chan ma.Multiaddr - var next ma.Multiaddr - if len(buffer) > 0 { - next = buffer[0] - buffer = buffer[1:] - outch = out - } - - for { - select { - case outch <- next: - if len(buffer) > 0 { - next = buffer[0] - buffer = buffer[1:] - } else { - outch = nil - next = nil - } - case naddr := <-sub.pubch: - if _, ok := sent[string(naddr.Bytes())]; ok { - continue - } - sent[string(naddr.Bytes())] = struct{}{} - - if next == nil { - next = naddr - outch = out - } else { - buffer = append(buffer, naddr) - } - case <-ctx.Done(): - mgr.removeSub(p, sub) - return - } - } - }(initial) - - return out + return pstoremem.NewAddrSubManager() } diff --git a/pstoremem/inmem_test.go b/pstoremem/inmem_test.go deleted file mode 100644 index 2cb012b..0000000 --- a/pstoremem/inmem_test.go +++ /dev/null @@ -1,84 +0,0 @@ -package pstoremem - -import ( - "testing" - - pt "github.com/libp2p/go-libp2p-peerstore/test" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" - - mockClock "github.com/benbjohnson/clock" - "github.com/stretchr/testify/require" - "go.uber.org/goleak" -) - -func TestInvalidOption(t *testing.T) { - _, err := NewPeerstore(1337) - require.EqualError(t, err, "unexpected peer store option: 1337") -} - -func TestFuzzInMemoryPeerstore(t *testing.T) { - // Just create and close a bunch of peerstores. If this leaks, we'll - // catch it in the leak check below. - for i := 0; i < 100; i++ { - ps, err := NewPeerstore() - require.NoError(t, err) - ps.Close() - } -} - -func TestInMemoryPeerstore(t *testing.T) { - pt.TestPeerstore(t, func() (pstore.Peerstore, func()) { - ps, err := NewPeerstore() - require.NoError(t, err) - return ps, func() { ps.Close() } - }) -} - -func TestPeerstoreProtoStoreLimits(t *testing.T) { - const limit = 10 - ps, err := NewPeerstore(WithMaxProtocols(limit)) - require.NoError(t, err) - defer ps.Close() - pt.TestPeerstoreProtoStoreLimits(t, ps, limit) -} - -func TestInMemoryAddrBook(t *testing.T) { - clk := mockClock.NewMock() - pt.TestAddrBook(t, func() (pstore.AddrBook, func()) { - ps, err := NewPeerstore(WithClock(clk)) - require.NoError(t, err) - return ps, func() { ps.Close() } - }, clk) -} - -func TestInMemoryKeyBook(t *testing.T) { - pt.TestKeyBook(t, func() (pstore.KeyBook, func()) { - ps, err := NewPeerstore() - require.NoError(t, err) - return ps, func() { ps.Close() } - }) -} - -func BenchmarkInMemoryPeerstore(b *testing.B) { - pt.BenchmarkPeerstore(b, func() (pstore.Peerstore, func()) { - ps, err := NewPeerstore() - require.NoError(b, err) - return ps, func() { ps.Close() } - }, "InMem") -} - -func BenchmarkInMemoryKeyBook(b *testing.B) { - pt.BenchmarkKeyBook(b, func() (pstore.KeyBook, func()) { - ps, err := NewPeerstore() - require.NoError(b, err) - return ps, func() { ps.Close() } - }) -} - -func TestMain(m *testing.M) { - goleak.VerifyTestMain( - m, - goleak.IgnoreTopFunction("github.com/ipfs/go-log/v2/writer.(*MirrorWriter).logRoutine"), - ) -} diff --git a/pstoremem/keybook.go b/pstoremem/keybook.go index 387a573..e77364c 100644 --- a/pstoremem/keybook.go +++ b/pstoremem/keybook.go @@ -1,98 +1,11 @@ package pstoremem import ( - "errors" - "sync" - - ic "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem" ) -type memoryKeyBook struct { - sync.RWMutex // same lock. wont happen a ton. - pks map[peer.ID]ic.PubKey - sks map[peer.ID]ic.PrivKey -} - -var _ pstore.KeyBook = (*memoryKeyBook)(nil) - -func NewKeyBook() *memoryKeyBook { - return &memoryKeyBook{ - pks: map[peer.ID]ic.PubKey{}, - sks: map[peer.ID]ic.PrivKey{}, - } -} - -func (mkb *memoryKeyBook) PeersWithKeys() peer.IDSlice { - mkb.RLock() - ps := make(peer.IDSlice, 0, len(mkb.pks)+len(mkb.sks)) - for p := range mkb.pks { - ps = append(ps, p) - } - for p := range mkb.sks { - if _, found := mkb.pks[p]; !found { - ps = append(ps, p) - } - } - mkb.RUnlock() - return ps -} - -func (mkb *memoryKeyBook) PubKey(p peer.ID) ic.PubKey { - mkb.RLock() - pk := mkb.pks[p] - mkb.RUnlock() - if pk != nil { - return pk - } - pk, err := p.ExtractPublicKey() - if err == nil { - mkb.Lock() - mkb.pks[p] = pk - mkb.Unlock() - } - return pk -} - -func (mkb *memoryKeyBook) AddPubKey(p peer.ID, pk ic.PubKey) error { - // check it's correct first - if !p.MatchesPublicKey(pk) { - return errors.New("ID does not match PublicKey") - } - - mkb.Lock() - mkb.pks[p] = pk - mkb.Unlock() - return nil -} - -func (mkb *memoryKeyBook) PrivKey(p peer.ID) ic.PrivKey { - mkb.RLock() - defer mkb.RUnlock() - return mkb.sks[p] -} - -func (mkb *memoryKeyBook) AddPrivKey(p peer.ID, sk ic.PrivKey) error { - if sk == nil { - return errors.New("sk is nil (PrivKey)") - } - - // check it's correct first - if !p.MatchesPrivateKey(sk) { - return errors.New("ID does not match PrivateKey") - } - - mkb.Lock() - mkb.sks[p] = sk - mkb.Unlock() - return nil -} - -func (mkb *memoryKeyBook) RemovePeer(p peer.ID) { - mkb.Lock() - delete(mkb.sks, p) - delete(mkb.pks, p) - mkb.Unlock() +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewKeyBook instead +func NewKeyBook() pstore.KeyBook { + return pstoremem.NewKeyBook() } diff --git a/pstoremem/metadata.go b/pstoremem/metadata.go index 0fd41c0..79a26b9 100644 --- a/pstoremem/metadata.go +++ b/pstoremem/metadata.go @@ -1,54 +1,11 @@ package pstoremem import ( - "sync" - - "github.com/libp2p/go-libp2p-core/peer" - pstore "github.com/libp2p/go-libp2p-core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem" ) -type memoryPeerMetadata struct { - // store other data, like versions - ds map[peer.ID]map[string]interface{} - dslock sync.RWMutex -} - -var _ pstore.PeerMetadata = (*memoryPeerMetadata)(nil) - -func NewPeerMetadata() *memoryPeerMetadata { - return &memoryPeerMetadata{ - ds: make(map[peer.ID]map[string]interface{}), - } -} - -func (ps *memoryPeerMetadata) Put(p peer.ID, key string, val interface{}) error { - ps.dslock.Lock() - defer ps.dslock.Unlock() - m, ok := ps.ds[p] - if !ok { - m = make(map[string]interface{}) - ps.ds[p] = m - } - m[key] = val - return nil -} - -func (ps *memoryPeerMetadata) Get(p peer.ID, key string) (interface{}, error) { - ps.dslock.RLock() - defer ps.dslock.RUnlock() - m, ok := ps.ds[p] - if !ok { - return nil, pstore.ErrNotFound - } - val, ok := m[key] - if !ok { - return nil, pstore.ErrNotFound - } - return val, nil -} - -func (ps *memoryPeerMetadata) RemovePeer(p peer.ID) { - ps.dslock.Lock() - delete(ps.ds, p) - ps.dslock.Unlock() +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewPeerMetadata instead +func NewPeerMetadata() pstore.PeerMetadata { + return pstoremem.NewPeerMetadata() } diff --git a/pstoremem/peerstore.go b/pstoremem/peerstore.go index ce34dc8..452ca63 100644 --- a/pstoremem/peerstore.go +++ b/pstoremem/peerstore.go @@ -1,115 +1,18 @@ +// Deprecated: This package has moved into go-libp2p as a sub-package: github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem. package pstoremem import ( - "fmt" - "io" - - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/peerstore" - - pstore "github.com/libp2p/go-libp2p-peerstore" + "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem" ) -type pstoremem struct { - peerstore.Metrics - - *memoryKeyBook - *memoryAddrBook - *memoryProtoBook - *memoryPeerMetadata -} - -var _ peerstore.Peerstore = &pstoremem{} - -type Option interface{} +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.Option instead +type Option = pstoremem.Option // NewPeerstore creates an in-memory threadsafe collection of peers. // It's the caller's responsibility to call RemovePeer to ensure // that memory consumption of the peerstore doesn't grow unboundedly. -func NewPeerstore(opts ...Option) (ps *pstoremem, err error) { - ab := NewAddrBook() - defer func() { - if err != nil { - ab.Close() - } - }() - - var protoBookOpts []ProtoBookOption - for _, opt := range opts { - switch o := opt.(type) { - case ProtoBookOption: - protoBookOpts = append(protoBookOpts, o) - case AddrBookOption: - o(ab) - default: - return nil, fmt.Errorf("unexpected peer store option: %v", o) - } - } - pb, err := NewProtoBook(protoBookOpts...) - if err != nil { - return nil, err - } - return &pstoremem{ - Metrics: pstore.NewMetrics(), - memoryKeyBook: NewKeyBook(), - memoryAddrBook: ab, - memoryProtoBook: pb, - memoryPeerMetadata: NewPeerMetadata(), - }, nil -} - -func (ps *pstoremem) Close() (err error) { - var errs []error - weakClose := func(name string, c interface{}) { - if cl, ok := c.(io.Closer); ok { - if err = cl.Close(); err != nil { - errs = append(errs, fmt.Errorf("%s error: %s", name, err)) - } - } - } - weakClose("keybook", ps.memoryKeyBook) - weakClose("addressbook", ps.memoryAddrBook) - weakClose("protobook", ps.memoryProtoBook) - weakClose("peermetadata", ps.memoryPeerMetadata) - - if len(errs) > 0 { - return fmt.Errorf("failed while closing peerstore; err(s): %q", errs) - } - return nil -} - -func (ps *pstoremem) Peers() peer.IDSlice { - set := map[peer.ID]struct{}{} - for _, p := range ps.PeersWithKeys() { - set[p] = struct{}{} - } - for _, p := range ps.PeersWithAddrs() { - set[p] = struct{}{} - } - - pps := make(peer.IDSlice, 0, len(set)) - for p := range set { - pps = append(pps, p) - } - return pps -} - -func (ps *pstoremem) PeerInfo(p peer.ID) peer.AddrInfo { - return peer.AddrInfo{ - ID: p, - Addrs: ps.memoryAddrBook.Addrs(p), - } -} - -// RemovePeer removes entries associated with a peer from: -// * the KeyBook -// * the ProtoBook -// * the PeerMetadata -// * the Metrics -// It DOES NOT remove the peer from the AddrBook. -func (ps *pstoremem) RemovePeer(p peer.ID) { - ps.memoryKeyBook.RemovePeer(p) - ps.memoryProtoBook.RemovePeer(p) - ps.memoryPeerMetadata.RemovePeer(p) - ps.Metrics.RemovePeer(p) +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewPeerstore instead +func NewPeerstore(opts ...Option) (ps peerstore.Peerstore, err error) { + return pstoremem.NewPeerstore(opts...) } diff --git a/pstoremem/protobook.go b/pstoremem/protobook.go index b2cf73e..46b8ec8 100644 --- a/pstoremem/protobook.go +++ b/pstoremem/protobook.go @@ -1,192 +1,19 @@ package pstoremem import ( - "errors" - "sync" - - "github.com/libp2p/go-libp2p-core/peer" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" + pstore "github.com/libp2p/go-libp2p/core/peerstore" + "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem" ) -type protoSegment struct { - sync.RWMutex - protocols map[peer.ID]map[string]struct{} -} - -type protoSegments [256]*protoSegment - -func (s *protoSegments) get(p peer.ID) *protoSegment { - return s[byte(p[len(p)-1])] -} - -var errTooManyProtocols = errors.New("too many protocols") - -type memoryProtoBook struct { - segments protoSegments - - maxProtos int - - lk sync.RWMutex - interned map[string]string -} - -var _ pstore.ProtoBook = (*memoryProtoBook)(nil) - -type ProtoBookOption func(book *memoryProtoBook) error +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.ProtoBookOption instead +type ProtoBookOption = pstoremem.ProtoBookOption +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.WithMaxProtocols instead func WithMaxProtocols(num int) ProtoBookOption { - return func(pb *memoryProtoBook) error { - pb.maxProtos = num - return nil - } + return pstoremem.WithMaxProtocols(num) } -func NewProtoBook(opts ...ProtoBookOption) (*memoryProtoBook, error) { - pb := &memoryProtoBook{ - interned: make(map[string]string, 256), - segments: func() (ret protoSegments) { - for i := range ret { - ret[i] = &protoSegment{ - protocols: make(map[peer.ID]map[string]struct{}), - } - } - return ret - }(), - maxProtos: 1024, - } - - for _, opt := range opts { - if err := opt(pb); err != nil { - return nil, err - } - } - return pb, nil -} - -func (pb *memoryProtoBook) internProtocol(proto string) string { - // check if it is interned with the read lock - pb.lk.RLock() - interned, ok := pb.interned[proto] - pb.lk.RUnlock() - - if ok { - return interned - } - - // intern with the write lock - pb.lk.Lock() - defer pb.lk.Unlock() - - // check again in case it got interned in between locks - interned, ok = pb.interned[proto] - if ok { - return interned - } - - pb.interned[proto] = proto - return proto -} - -func (pb *memoryProtoBook) SetProtocols(p peer.ID, protos ...string) error { - if len(protos) > pb.maxProtos { - return errTooManyProtocols - } - - newprotos := make(map[string]struct{}, len(protos)) - for _, proto := range protos { - newprotos[pb.internProtocol(proto)] = struct{}{} - } - - s := pb.segments.get(p) - s.Lock() - s.protocols[p] = newprotos - s.Unlock() - - return nil -} - -func (pb *memoryProtoBook) AddProtocols(p peer.ID, protos ...string) error { - s := pb.segments.get(p) - s.Lock() - defer s.Unlock() - - protomap, ok := s.protocols[p] - if !ok { - protomap = make(map[string]struct{}) - s.protocols[p] = protomap - } - if len(protomap)+len(protos) > pb.maxProtos { - return errTooManyProtocols - } - - for _, proto := range protos { - protomap[pb.internProtocol(proto)] = struct{}{} - } - return nil -} - -func (pb *memoryProtoBook) GetProtocols(p peer.ID) ([]string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - out := make([]string, 0, len(s.protocols[p])) - for k := range s.protocols[p] { - out = append(out, k) - } - - return out, nil -} - -func (pb *memoryProtoBook) RemoveProtocols(p peer.ID, protos ...string) error { - s := pb.segments.get(p) - s.Lock() - defer s.Unlock() - - protomap, ok := s.protocols[p] - if !ok { - // nothing to remove. - return nil - } - - for _, proto := range protos { - delete(protomap, pb.internProtocol(proto)) - } - return nil -} - -func (pb *memoryProtoBook) SupportsProtocols(p peer.ID, protos ...string) ([]string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - out := make([]string, 0, len(protos)) - for _, proto := range protos { - if _, ok := s.protocols[p][proto]; ok { - out = append(out, proto) - } - } - - return out, nil -} - -func (pb *memoryProtoBook) FirstSupportedProtocol(p peer.ID, protos ...string) (string, error) { - s := pb.segments.get(p) - s.RLock() - defer s.RUnlock() - - for _, proto := range protos { - if _, ok := s.protocols[p][proto]; ok { - return proto, nil - } - } - return "", nil -} - -func (pb *memoryProtoBook) RemovePeer(p peer.ID) { - s := pb.segments.get(p) - s.Lock() - delete(s.protocols, p) - s.Unlock() +// Deprecated: use github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem.NewProtoBook instead +func NewProtoBook(opts ...ProtoBookOption) (pstore.ProtoBook, error) { + return pstoremem.NewProtoBook(opts...) } diff --git a/pstoremem/sorting.go b/pstoremem/sorting.go deleted file mode 100644 index f36ac41..0000000 --- a/pstoremem/sorting.go +++ /dev/null @@ -1,50 +0,0 @@ -package pstoremem - -import ( - "bytes" - - ma "github.com/multiformats/go-multiaddr" - mafmt "github.com/multiformats/go-multiaddr-fmt" - manet "github.com/multiformats/go-multiaddr/net" -) - -func isFDCostlyTransport(a ma.Multiaddr) bool { - return mafmt.TCP.Matches(a) -} - -type addrList []ma.Multiaddr - -func (al addrList) Len() int { return len(al) } -func (al addrList) Swap(i, j int) { al[i], al[j] = al[j], al[i] } - -func (al addrList) Less(i, j int) bool { - a := al[i] - b := al[j] - - // dial localhost addresses next, they should fail immediately - lba := manet.IsIPLoopback(a) - lbb := manet.IsIPLoopback(b) - if lba && !lbb { - return true - } - - // dial utp and similar 'non-fd-consuming' addresses first - fda := isFDCostlyTransport(a) - fdb := isFDCostlyTransport(b) - if !fda { - return fdb - } - - // if 'b' doesnt take a file descriptor - if !fdb { - return false - } - - // if 'b' is loopback and both take file descriptors - if lbb { - return false - } - - // for the rest, just sort by bytes - return bytes.Compare(a.Bytes(), b.Bytes()) > 0 -} diff --git a/pstoremem/sorting_test.go b/pstoremem/sorting_test.go deleted file mode 100644 index 8ea52d1..0000000 --- a/pstoremem/sorting_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package pstoremem - -import ( - "sort" - "testing" - - ma "github.com/multiformats/go-multiaddr" - "github.com/stretchr/testify/require" -) - -func TestAddressSorting(t *testing.T) { - u1 := ma.StringCast("/ip4/152.12.23.53/udp/1234/utp") - u2l := ma.StringCast("/ip4/127.0.0.1/udp/1234/utp") - local := ma.StringCast("/ip4/127.0.0.1/tcp/1234") - norm := ma.StringCast("/ip4/6.5.4.3/tcp/1234") - - l := addrList{local, u1, u2l, norm} - sort.Sort(l) - require.Equal(t, l, addrList{u2l, u1, local, norm}) -} diff --git a/test/addr_book_suite.go b/test/addr_book_suite.go deleted file mode 100644 index 5bcf882..0000000 --- a/test/addr_book_suite.go +++ /dev/null @@ -1,506 +0,0 @@ -package test - -import ( - "testing" - "time" - - mockClock "github.com/benbjohnson/clock" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/record" - "github.com/libp2p/go-libp2p-core/test" - "github.com/multiformats/go-multiaddr" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" -) - -var addressBookSuite = map[string]func(book pstore.AddrBook, clk *mockClock.Mock) func(*testing.T){ - "AddAddress": testAddAddress, - "Clear": testClearWorks, - "SetNegativeTTLClears": testSetNegativeTTLClears, - "UpdateTTLs": testUpdateTTLs, - "NilAddrsDontBreak": testNilAddrsDontBreak, - "AddressesExpire": testAddressesExpire, - "ClearWithIter": testClearWithIterator, - "PeersWithAddresses": testPeersWithAddrs, - "CertifiedAddresses": testCertifiedAddresses, -} - -type AddrBookFactory func() (pstore.AddrBook, func()) - -func TestAddrBook(t *testing.T, factory AddrBookFactory, clk *mockClock.Mock) { - for name, test := range addressBookSuite { - // Create a new peerstore. - ab, closeFunc := factory() - - // Run the test. - t.Run(name, test(ab, clk)) - - // Cleanup. - if closeFunc != nil { - closeFunc() - } - } -} - -func testAddAddress(ab pstore.AddrBook, clk *mockClock.Mock) func(*testing.T) { - return func(t *testing.T) { - t.Run("add a single address", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(1) - - ab.AddAddr(id, addrs[0], time.Hour) - - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - }) - - t.Run("idempotent add single address", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(1) - - ab.AddAddr(id, addrs[0], time.Hour) - ab.AddAddr(id, addrs[0], time.Hour) - - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - }) - - t.Run("add multiple addresses", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(3) - - ab.AddAddrs(id, addrs, time.Hour) - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - }) - - t.Run("idempotent add multiple addresses", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(3) - - ab.AddAddrs(id, addrs, time.Hour) - ab.AddAddrs(id, addrs, time.Hour) - - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - }) - - t.Run("adding an existing address with a later expiration extends its ttl", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(3) - - ab.AddAddrs(id, addrs, time.Second) - - // same address as before but with a higher TTL - ab.AddAddrs(id, addrs[2:], time.Hour) - - // after the initial TTL has expired, check that only the third address is present. - clk.Add(1200 * time.Millisecond) - AssertAddressesEqual(t, addrs[2:], ab.Addrs(id)) - - // make sure we actually set the TTL - ab.UpdateAddrs(id, time.Hour, 0) - AssertAddressesEqual(t, nil, ab.Addrs(id)) - }) - - t.Run("adding an existing address with an earlier expiration never reduces the expiration", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(3) - - ab.AddAddrs(id, addrs, time.Hour) - - // same address as before but with a lower TTL - ab.AddAddrs(id, addrs[2:], time.Second) - - // after the initial TTL has expired, check that all three addresses are still present (i.e. the TTL on - // the modified one was not shortened). - clk.Add(2100 * time.Millisecond) - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - }) - - t.Run("adding an existing address with an earlier expiration never reduces the TTL", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(1) - - ab.AddAddrs(id, addrs, 4*time.Second) - // 4 seconds left - clk.Add(2 * time.Second) - // 2 second left - ab.AddAddrs(id, addrs, 3*time.Second) - // 3 seconds left - clk.Add(1 * time.Second) - // 2 seconds left. - - // We still have the address. - AssertAddressesEqual(t, addrs, ab.Addrs(id)) - - // The TTL wasn't reduced - ab.UpdateAddrs(id, 4*time.Second, 0) - AssertAddressesEqual(t, nil, ab.Addrs(id)) - }) - } -} - -func testClearWorks(ab pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - ids := GeneratePeerIDs(2) - addrs := GenerateAddrs(5) - - ab.AddAddrs(ids[0], addrs[0:3], time.Hour) - ab.AddAddrs(ids[1], addrs[3:], time.Hour) - - AssertAddressesEqual(t, addrs[0:3], ab.Addrs(ids[0])) - AssertAddressesEqual(t, addrs[3:], ab.Addrs(ids[1])) - - ab.ClearAddrs(ids[0]) - AssertAddressesEqual(t, nil, ab.Addrs(ids[0])) - AssertAddressesEqual(t, addrs[3:], ab.Addrs(ids[1])) - - ab.ClearAddrs(ids[1]) - AssertAddressesEqual(t, nil, ab.Addrs(ids[0])) - AssertAddressesEqual(t, nil, ab.Addrs(ids[1])) - } -} - -func testSetNegativeTTLClears(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(100) - - m.SetAddrs(id, addrs, time.Hour) - AssertAddressesEqual(t, addrs, m.Addrs(id)) - - // remove two addresses. - m.SetAddr(id, addrs[50], -1) - m.SetAddr(id, addrs[75], -1) - - // calculate the survivors - survivors := append(addrs[0:50], addrs[51:]...) - survivors = append(survivors[0:74], survivors[75:]...) - - AssertAddressesEqual(t, survivors, m.Addrs(id)) - - // remove _all_ the addresses - m.SetAddrs(id, survivors, -1) - if len(m.Addrs(id)) != 0 { - t.Error("expected empty address list after clearing all addresses") - } - - // add half, but try to remove more than we added - m.SetAddrs(id, addrs[:50], time.Hour) - m.SetAddrs(id, addrs, -1) - if len(m.Addrs(id)) != 0 { - t.Error("expected empty address list after clearing all addresses") - } - - // try to remove the same addr multiple times - m.SetAddrs(id, addrs[:5], time.Hour) - repeated := make([]multiaddr.Multiaddr, 10) - for i := 0; i < len(repeated); i++ { - repeated[i] = addrs[0] - } - m.SetAddrs(id, repeated, -1) - if len(m.Addrs(id)) != 4 { - t.Errorf("expected 4 addrs after removing one, got %d", len(m.Addrs(id))) - } - } -} - -func testUpdateTTLs(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - t.Run("update ttl of peer with no addrs", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - - // Shouldn't panic. - m.UpdateAddrs(id, time.Hour, time.Minute) - }) - - t.Run("update to 0 clears addrs", func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - addrs := GenerateAddrs(1) - - // Shouldn't panic. - m.SetAddrs(id, addrs, time.Hour) - m.UpdateAddrs(id, time.Hour, 0) - if len(m.Addrs(id)) != 0 { - t.Error("expected no addresses") - } - }) - - t.Run("update ttls successfully", func(t *testing.T) { - ids := GeneratePeerIDs(2) - addrs1, addrs2 := GenerateAddrs(2), GenerateAddrs(2) - - // set two keys with different ttls for each peer. - m.SetAddr(ids[0], addrs1[0], time.Hour) - m.SetAddr(ids[0], addrs1[1], time.Minute) - m.SetAddr(ids[1], addrs2[0], time.Hour) - m.SetAddr(ids[1], addrs2[1], time.Minute) - - // Sanity check. - AssertAddressesEqual(t, addrs1, m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - // Will only affect addrs1[0]. - // Badger does not support subsecond TTLs. - // https://github.com/dgraph-io/badger/issues/339 - m.UpdateAddrs(ids[0], time.Hour, 1*time.Second) - - // No immediate effect. - AssertAddressesEqual(t, addrs1, m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - // After a wait, addrs[0] is gone. - clk.Add(2 * time.Second) - AssertAddressesEqual(t, addrs1[1:2], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - // Will only affect addrs2[0]. - m.UpdateAddrs(ids[1], time.Hour, 1*time.Second) - - // No immediate effect. - AssertAddressesEqual(t, addrs1[1:2], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - clk.Add(2 * time.Second) - - // First addrs is gone in both. - AssertAddressesEqual(t, addrs1[1:], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2[1:], m.Addrs(ids[1])) - }) - - } -} - -func testNilAddrsDontBreak(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - id := GeneratePeerIDs(1)[0] - - m.SetAddr(id, nil, time.Hour) - m.AddAddr(id, nil, time.Hour) - } -} - -func testAddressesExpire(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - ids := GeneratePeerIDs(2) - addrs1 := GenerateAddrs(3) - addrs2 := GenerateAddrs(2) - - m.AddAddrs(ids[0], addrs1, time.Hour) - m.AddAddrs(ids[1], addrs2, time.Hour) - - AssertAddressesEqual(t, addrs1, m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - m.AddAddrs(ids[0], addrs1, 2*time.Hour) - m.AddAddrs(ids[1], addrs2, 2*time.Hour) - - AssertAddressesEqual(t, addrs1, m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - m.SetAddr(ids[0], addrs1[0], 100*time.Microsecond) - clk.Add(100 * time.Millisecond) - AssertAddressesEqual(t, addrs1[1:3], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - m.SetAddr(ids[0], addrs1[2], 100*time.Microsecond) - clk.Add(100 * time.Millisecond) - AssertAddressesEqual(t, addrs1[1:2], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2, m.Addrs(ids[1])) - - m.SetAddr(ids[1], addrs2[0], 100*time.Microsecond) - clk.Add(100 * time.Millisecond) - AssertAddressesEqual(t, addrs1[1:2], m.Addrs(ids[0])) - AssertAddressesEqual(t, addrs2[1:], m.Addrs(ids[1])) - - m.SetAddr(ids[1], addrs2[1], 100*time.Microsecond) - clk.Add(100 * time.Millisecond) - AssertAddressesEqual(t, addrs1[1:2], m.Addrs(ids[0])) - AssertAddressesEqual(t, nil, m.Addrs(ids[1])) - - m.SetAddr(ids[0], addrs1[1], 100*time.Microsecond) - clk.Add(100 * time.Millisecond) - AssertAddressesEqual(t, nil, m.Addrs(ids[0])) - AssertAddressesEqual(t, nil, m.Addrs(ids[1])) - } -} - -func testClearWithIterator(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - ids := GeneratePeerIDs(2) - addrs := GenerateAddrs(100) - - // Add the peers with 50 addresses each. - m.AddAddrs(ids[0], addrs[:50], pstore.PermanentAddrTTL) - m.AddAddrs(ids[1], addrs[50:], pstore.PermanentAddrTTL) - - if all := append(m.Addrs(ids[0]), m.Addrs(ids[1])...); len(all) != 100 { - t.Fatal("expected pstore to contain both peers with all their maddrs") - } - - // Since we don't fetch these peers, they won't be present in cache. - - m.ClearAddrs(ids[0]) - if all := append(m.Addrs(ids[0]), m.Addrs(ids[1])...); len(all) != 50 { - t.Fatal("expected pstore to contain only addrs of peer 2") - } - - m.ClearAddrs(ids[1]) - if all := append(m.Addrs(ids[0]), m.Addrs(ids[1])...); len(all) != 0 { - t.Fatal("expected pstore to contain no addresses") - } - } -} - -func testPeersWithAddrs(m pstore.AddrBook, clk *mockClock.Mock) func(t *testing.T) { - return func(t *testing.T) { - // cannot run in parallel as the store is modified. - // go runs sequentially in the specified order - // see https://blog.golang.org/subtests - - t.Run("empty addrbook", func(t *testing.T) { - if peers := m.PeersWithAddrs(); len(peers) != 0 { - t.Fatal("expected to find no peers") - } - }) - - t.Run("non-empty addrbook", func(t *testing.T) { - ids := GeneratePeerIDs(2) - addrs := GenerateAddrs(10) - - m.AddAddrs(ids[0], addrs[:5], pstore.PermanentAddrTTL) - m.AddAddrs(ids[1], addrs[5:], pstore.PermanentAddrTTL) - - if peers := m.PeersWithAddrs(); len(peers) != 2 { - t.Fatal("expected to find 2 peers") - } - }) - } -} - -func testCertifiedAddresses(m pstore.AddrBook, clk *mockClock.Mock) func(*testing.T) { - return func(t *testing.T) { - cab := m.(pstore.CertifiedAddrBook) - - priv, _, err := test.RandTestKeyPair(crypto.Ed25519, 256) - if err != nil { - t.Errorf("error generating testing keys: %v", err) - } - - id, _ := peer.IDFromPrivateKey(priv) - allAddrs := GenerateAddrs(10) - certifiedAddrs := allAddrs[:5] - uncertifiedAddrs := allAddrs[5:] - rec1 := peer.NewPeerRecord() - rec1.PeerID = id - rec1.Addrs = certifiedAddrs - signedRec1, err := record.Seal(rec1, priv) - if err != nil { - t.Errorf("error creating signed routing record: %v", err) - } - - rec2 := peer.NewPeerRecord() - rec2.PeerID = id - rec2.Addrs = certifiedAddrs - signedRec2, err := record.Seal(rec2, priv) - if err != nil { - t.Errorf("error creating signed routing record: %v", err) - } - - // add a few non-certified addrs - m.AddAddrs(id, uncertifiedAddrs, time.Hour) - - // make sure they're present - AssertAddressesEqual(t, uncertifiedAddrs, m.Addrs(id)) - - // add the signed record to addr book - accepted, err := cab.ConsumePeerRecord(signedRec2, time.Hour) - if err != nil { - t.Errorf("error adding signed routing record to addrbook: %v", err) - } - if !accepted { - t.Errorf("should have accepted signed peer record") - } - - // the non-certified addrs should be gone & we should get only certified addrs back from Addrs - // AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id)) - AssertAddressesEqual(t, allAddrs, m.Addrs(id)) - - // PeersWithAddrs should return a single peer - if len(m.PeersWithAddrs()) != 1 { - t.Errorf("expected PeersWithAddrs to return 1, got %d", len(m.PeersWithAddrs())) - } - - // Adding an old record should fail - accepted, err = cab.ConsumePeerRecord(signedRec1, time.Hour) - if accepted { - t.Error("We should have failed to accept a record with an old sequence number") - } - if err != nil { - t.Errorf("expected no error, got: %s", err) - } - - // once certified addrs exist, trying to add non-certified addrs should have no effect - // m.AddAddrs(id, uncertifiedAddrs, time.Hour) - // AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id)) - // XXX: Disabled until signed records are required - m.AddAddrs(id, uncertifiedAddrs, time.Hour) - AssertAddressesEqual(t, allAddrs, m.Addrs(id)) - - // we should be able to retrieve the signed peer record - rec3 := cab.GetPeerRecord(id) - if rec3 == nil || !signedRec2.Equal(rec3) { - t.Error("unable to retrieve signed routing record from addrbook") - } - - // Adding a new envelope should clear existing certified addresses. - // Only the newly-added ones should remain - certifiedAddrs = certifiedAddrs[:3] - rec4 := peer.NewPeerRecord() - rec4.PeerID = id - rec4.Addrs = certifiedAddrs - signedRec4, err := record.Seal(rec4, priv) - test.AssertNilError(t, err) - accepted, err = cab.ConsumePeerRecord(signedRec4, time.Hour) - test.AssertNilError(t, err) - if !accepted { - t.Error("expected peer record to be accepted") - } - // AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id)) - AssertAddressesEqual(t, allAddrs, m.Addrs(id)) - - // update TTL on signed addrs to -1 to remove them. - // the signed routing record should be deleted - // m.SetAddrs(id, certifiedAddrs, -1) - // XXX: Disabled until signed records are required - m.SetAddrs(id, allAddrs, -1) - if len(m.Addrs(id)) != 0 { - t.Error("expected zero certified addrs after setting TTL to -1") - } - if cab.GetPeerRecord(id) != nil { - t.Error("expected signed peer record to be removed when addresses expire") - } - - // Test that natural TTL expiration clears signed peer records - accepted, err = cab.ConsumePeerRecord(signedRec4, time.Second) - if !accepted { - t.Error("expected peer record to be accepted") - } - test.AssertNilError(t, err) - AssertAddressesEqual(t, certifiedAddrs, m.Addrs(id)) - - clk.Add(2 * time.Second) - if cab.GetPeerRecord(id) != nil { - t.Error("expected signed peer record to be removed when addresses expire") - } - - // adding a peer record that's signed with the wrong key should fail - priv2, _, err := test.RandTestKeyPair(crypto.Ed25519, 256) - test.AssertNilError(t, err) - env, err := record.Seal(rec4, priv2) - test.AssertNilError(t, err) - - accepted, err = cab.ConsumePeerRecord(env, time.Second) - if accepted || err == nil { - t.Error("expected adding a PeerRecord that's signed with the wrong key to fail") - } - } -} diff --git a/test/benchmarks_suite.go b/test/benchmarks_suite.go deleted file mode 100644 index c67303b..0000000 --- a/test/benchmarks_suite.go +++ /dev/null @@ -1,124 +0,0 @@ -package test - -import ( - "context" - "fmt" - "sort" - "testing" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" -) - -var peerstoreBenchmarks = map[string]func(pstore.Peerstore, chan *peerpair) func(*testing.B){ - "AddAddrs": benchmarkAddAddrs, - "SetAddrs": benchmarkSetAddrs, - "GetAddrs": benchmarkGetAddrs, - // The in-between get allows us to benchmark the read-through cache. - "AddGetAndClearAddrs": benchmarkAddGetAndClearAddrs, - // Calls PeersWithAddr on a peerstore with 1000 peers. - "Get1000PeersWithAddrs": benchmarkGet1000PeersWithAddrs, -} - -func BenchmarkPeerstore(b *testing.B, factory PeerstoreFactory, variant string) { - // Parameterises benchmarks to tackle peers with 1, 10, 100 multiaddrs. - params := []struct { - n int - ch chan *peerpair - }{ - {1, make(chan *peerpair, 100)}, - {10, make(chan *peerpair, 100)}, - {100, make(chan *peerpair, 100)}, - } - - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - // Start all test peer producing goroutines, where each produces peers with as many - // multiaddrs as the n field in the param struct. - for _, p := range params { - go AddressProducer(ctx, b, p.ch, p.n) - } - - // So tests are always run in the same order. - ordernames := make([]string, 0, len(peerstoreBenchmarks)) - for name := range peerstoreBenchmarks { - ordernames = append(ordernames, name) - } - sort.Strings(ordernames) - - for _, name := range ordernames { - bench := peerstoreBenchmarks[name] - for _, p := range params { - // Create a new peerstore. - ps, closeFunc := factory() - - // Run the test. - b.Run(fmt.Sprintf("%s-%dAddrs-%s", name, p.n, variant), bench(ps, p.ch)) - - // Cleanup. - if closeFunc != nil { - closeFunc() - } - } - } -} - -func benchmarkAddAddrs(ps pstore.Peerstore, addrs chan *peerpair) func(*testing.B) { - return func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - pp := <-addrs - ps.AddAddrs(pp.ID, pp.Addr, pstore.PermanentAddrTTL) - } - } -} - -func benchmarkSetAddrs(ps pstore.Peerstore, addrs chan *peerpair) func(*testing.B) { - return func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - pp := <-addrs - ps.SetAddrs(pp.ID, pp.Addr, pstore.PermanentAddrTTL) - } - } -} - -func benchmarkGetAddrs(ps pstore.Peerstore, addrs chan *peerpair) func(*testing.B) { - return func(b *testing.B) { - pp := <-addrs - ps.SetAddrs(pp.ID, pp.Addr, pstore.PermanentAddrTTL) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = ps.Addrs(pp.ID) - } - } -} - -func benchmarkAddGetAndClearAddrs(ps pstore.Peerstore, addrs chan *peerpair) func(*testing.B) { - return func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - pp := <-addrs - ps.AddAddrs(pp.ID, pp.Addr, pstore.PermanentAddrTTL) - ps.Addrs(pp.ID) - ps.ClearAddrs(pp.ID) - } - } -} - -func benchmarkGet1000PeersWithAddrs(ps pstore.Peerstore, addrs chan *peerpair) func(*testing.B) { - return func(b *testing.B) { - var peers = make([]*peerpair, 1000) - for i := range peers { - pp := <-addrs - ps.AddAddrs(pp.ID, pp.Addr, pstore.PermanentAddrTTL) - peers[i] = pp - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = ps.PeersWithAddrs() - } - } -} diff --git a/test/keybook_suite.go b/test/keybook_suite.go deleted file mode 100644 index 2774b3d..0000000 --- a/test/keybook_suite.go +++ /dev/null @@ -1,338 +0,0 @@ -package test - -import ( - "sort" - "testing" - - "github.com/stretchr/testify/require" - - ic "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - pt "github.com/libp2p/go-libp2p-core/test" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" -) - -var keyBookSuite = map[string]func(kb pstore.KeyBook) func(*testing.T){ - "AddGetPrivKey": testKeybookPrivKey, - "AddGetPubKey": testKeyBookPubKey, - "PeersWithKeys": testKeyBookPeers, - "PubKeyAddedOnRetrieve": testInlinedPubKeyAddedOnRetrieve, - "Delete": testKeyBookDelete, -} - -type KeyBookFactory func() (pstore.KeyBook, func()) - -func TestKeyBook(t *testing.T, factory KeyBookFactory) { - for name, test := range keyBookSuite { - // Create a new peerstore. - kb, closeFunc := factory() - - // Run the test. - t.Run(name, test(kb)) - - // Cleanup. - if closeFunc != nil { - closeFunc() - } - } -} - -func testKeybookPrivKey(kb pstore.KeyBook) func(t *testing.T) { - return func(t *testing.T) { - if peers := kb.PeersWithKeys(); len(peers) > 0 { - t.Error("expected peers to be empty on init") - } - - priv, _, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - t.Fatal(err) - } - - id, err := peer.IDFromPrivateKey(priv) - if err != nil { - t.Error(err) - } - - if res := kb.PrivKey(id); res != nil { - t.Error("retrieving private key should have failed") - } - - err = kb.AddPrivKey(id, priv) - if err != nil { - t.Error(err) - } - - if res := kb.PrivKey(id); !priv.Equals(res) { - t.Error("retrieved private key did not match stored private key") - } - - if peers := kb.PeersWithKeys(); len(peers) != 1 || peers[0] != id { - t.Error("list of peers did not include test peer") - } - } -} - -func testKeyBookPubKey(kb pstore.KeyBook) func(t *testing.T) { - return func(t *testing.T) { - if peers := kb.PeersWithKeys(); len(peers) > 0 { - t.Error("expected peers to be empty on init") - } - - _, pub, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - t.Fatal(err) - } - - id, err := peer.IDFromPublicKey(pub) - if err != nil { - t.Fatal(err) - } - - if res := kb.PubKey(id); res != nil { - t.Error("retrieving public key should have failed") - } - - err = kb.AddPubKey(id, pub) - if err != nil { - t.Error(err) - } - - if res := kb.PubKey(id); !pub.Equals(res) { - t.Error("retrieved public key did not match stored public key") - } - - if peers := kb.PeersWithKeys(); len(peers) != 1 || peers[0] != id { - t.Error("list of peers did not include test peer") - } - } -} - -func testKeyBookPeers(kb pstore.KeyBook) func(t *testing.T) { - return func(t *testing.T) { - if peers := kb.PeersWithKeys(); len(peers) > 0 { - t.Error("expected peers to be empty on init") - } - - var peers peer.IDSlice - for i := 0; i < 10; i++ { - // Add a public key. - _, pub, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - t.Fatal(err) - } - p1, err := peer.IDFromPublicKey(pub) - if err != nil { - t.Fatal(err) - } - kb.AddPubKey(p1, pub) - - // Add a private key. - priv, _, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - t.Fatal(err) - } - p2, err := peer.IDFromPrivateKey(priv) - if err != nil { - t.Fatal(err) - } - kb.AddPrivKey(p2, priv) - - peers = append(peers, []peer.ID{p1, p2}...) - } - - kbPeers := kb.PeersWithKeys() - sort.Sort(kbPeers) - sort.Sort(peers) - - for i, p := range kbPeers { - if p != peers[i] { - t.Errorf("mismatch of peer at index %d", i) - } - } - } -} - -func testInlinedPubKeyAddedOnRetrieve(kb pstore.KeyBook) func(t *testing.T) { - return func(t *testing.T) { - t.Skip("key inlining disabled for now: see libp2p/specs#111") - - if peers := kb.PeersWithKeys(); len(peers) > 0 { - t.Error("expected peers to be empty on init") - } - - // Key small enough for inlining. - _, pub, err := ic.GenerateKeyPair(ic.Ed25519, 256) - if err != nil { - t.Error(err) - } - - id, err := peer.IDFromPublicKey(pub) - if err != nil { - t.Error(err) - } - - pubKey := kb.PubKey(id) - if !pubKey.Equals(pub) { - t.Error("mismatch between original public key and keybook-calculated one") - } - } -} - -func testKeyBookDelete(kb pstore.KeyBook) func(t *testing.T) { - return func(t *testing.T) { - // don't use an ed25519 key here, otherwise the key book might try to derive the pubkey from the peer ID - priv, pub, err := ic.GenerateKeyPair(ic.RSA, 2048) - require.NoError(t, err) - p, err := peer.IDFromPublicKey(pub) - require.NoError(t, err) - require.NoError(t, kb.AddPubKey(p, pub)) - require.NoError(t, kb.AddPrivKey(p, priv)) - require.NotNil(t, kb.PrivKey(p)) - require.NotNil(t, kb.PubKey(p)) - kb.RemovePeer(p) - require.Nil(t, kb.PrivKey(p)) - require.Nil(t, kb.PubKey(p)) - } -} - -var keybookBenchmarkSuite = map[string]func(kb pstore.KeyBook) func(*testing.B){ - "PubKey": benchmarkPubKey, - "AddPubKey": benchmarkAddPubKey, - "PrivKey": benchmarkPrivKey, - "AddPrivKey": benchmarkAddPrivKey, - "PeersWithKeys": benchmarkPeersWithKeys, -} - -func BenchmarkKeyBook(b *testing.B, factory KeyBookFactory) { - ordernames := make([]string, 0, len(keybookBenchmarkSuite)) - for name := range keybookBenchmarkSuite { - ordernames = append(ordernames, name) - } - sort.Strings(ordernames) - for _, name := range ordernames { - bench := keybookBenchmarkSuite[name] - kb, closeFunc := factory() - - b.Run(name, bench(kb)) - - if closeFunc != nil { - closeFunc() - } - } -} - -func benchmarkPubKey(kb pstore.KeyBook) func(*testing.B) { - return func(b *testing.B) { - _, pub, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - b.Fatal(err) - } - - id, err := peer.IDFromPublicKey(pub) - if err != nil { - b.Fatal(err) - } - - err = kb.AddPubKey(id, pub) - if err != nil { - b.Fatal(err) - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - kb.PubKey(id) - } - } -} - -func benchmarkAddPubKey(kb pstore.KeyBook) func(*testing.B) { - return func(b *testing.B) { - _, pub, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - b.Fatal(err) - } - - id, err := peer.IDFromPublicKey(pub) - if err != nil { - b.Fatal(err) - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - kb.AddPubKey(id, pub) - } - } -} - -func benchmarkPrivKey(kb pstore.KeyBook) func(*testing.B) { - return func(b *testing.B) { - priv, _, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - b.Fatal(err) - } - - id, err := peer.IDFromPrivateKey(priv) - if err != nil { - b.Fatal(err) - } - - err = kb.AddPrivKey(id, priv) - if err != nil { - b.Fatal(err) - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - kb.PrivKey(id) - } - } -} - -func benchmarkAddPrivKey(kb pstore.KeyBook) func(*testing.B) { - return func(b *testing.B) { - priv, _, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - b.Fatal(err) - } - - id, err := peer.IDFromPrivateKey(priv) - if err != nil { - b.Fatal(err) - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - kb.AddPrivKey(id, priv) - } - } -} - -func benchmarkPeersWithKeys(kb pstore.KeyBook) func(*testing.B) { - return func(b *testing.B) { - for i := 0; i < 10; i++ { - priv, pub, err := pt.RandTestKeyPair(ic.RSA, 2048) - if err != nil { - b.Fatal(err) - } - - id, err := peer.IDFromPublicKey(pub) - if err != nil { - b.Fatal(err) - } - - err = kb.AddPubKey(id, pub) - if err != nil { - b.Fatal(err) - } - err = kb.AddPrivKey(id, priv) - if err != nil { - b.Fatal(err) - } - } - b.ResetTimer() - for i := 0; i < b.N; i++ { - kb.PeersWithKeys() - } - } -} diff --git a/test/peerstore_suite.go b/test/peerstore_suite.go deleted file mode 100644 index 38f9a49..0000000 --- a/test/peerstore_suite.go +++ /dev/null @@ -1,402 +0,0 @@ -package test - -import ( - "context" - "fmt" - "math/rand" - "reflect" - "sort" - "testing" - "time" - - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/peer" - ma "github.com/multiformats/go-multiaddr" - - pstore "github.com/libp2p/go-libp2p-core/peerstore" - "github.com/stretchr/testify/require" -) - -var peerstoreSuite = map[string]func(pstore.Peerstore) func(*testing.T){ - "AddrStream": testAddrStream, - "GetStreamBeforePeerAdded": testGetStreamBeforePeerAdded, - "AddStreamDuplicates": testAddrStreamDuplicates, - "PeerstoreProtoStore": testPeerstoreProtoStore, - "BasicPeerstore": testBasicPeerstore, - "Metadata": testMetadata, - "CertifiedAddrBook": testCertifiedAddrBook, -} - -type PeerstoreFactory func() (pstore.Peerstore, func()) - -func TestPeerstore(t *testing.T, factory PeerstoreFactory) { - for name, test := range peerstoreSuite { - // Create a new peerstore. - ps, closeFunc := factory() - - // Run the test. - t.Run(name, test(ps)) - - // Cleanup. - if closeFunc != nil { - closeFunc() - } - } -} - -func testAddrStream(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - addrs, pid := getAddrs(t, 100), peer.ID("testpeer") - ps.AddAddrs(pid, addrs[:10], time.Hour) - - ctx, cancel := context.WithCancel(context.Background()) - addrch := ps.AddrStream(ctx, pid) - - // while that subscription is active, publish ten more addrs - // this tests that it doesnt hang - for i := 10; i < 20; i++ { - ps.AddAddr(pid, addrs[i], time.Hour) - } - - // now receive them (without hanging) - timeout := time.After(time.Second * 10) - for i := 0; i < 20; i++ { - select { - case <-addrch: - case <-timeout: - t.Fatal("timed out") - } - } - - // start a second stream - ctx2, cancel2 := context.WithCancel(context.Background()) - addrch2 := ps.AddrStream(ctx2, pid) - - done := make(chan struct{}) - go func() { - defer close(done) - // now send the rest of the addresses - for _, a := range addrs[20:80] { - ps.AddAddr(pid, a, time.Hour) - } - }() - - // receive some concurrently with the goroutine - timeout = time.After(time.Second * 10) - for i := 0; i < 40; i++ { - select { - case <-addrch: - case <-timeout: - } - } - - <-done - - // receive some more after waiting for that goroutine to complete - timeout = time.After(time.Second * 10) - for i := 0; i < 20; i++ { - select { - case <-addrch: - case <-timeout: - } - } - - // now cancel it - cancel() - - // now check the *second* subscription. We should see 80 addresses. - for i := 0; i < 80; i++ { - <-addrch2 - } - - cancel2() - - // and add a few more addresses it doesnt hang afterwards - for _, a := range addrs[80:] { - ps.AddAddr(pid, a, time.Hour) - } - } -} - -func testGetStreamBeforePeerAdded(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - addrs, pid := getAddrs(t, 10), peer.ID("testpeer") - - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - ach := ps.AddrStream(ctx, pid) - for i := 0; i < 10; i++ { - ps.AddAddr(pid, addrs[i], time.Hour) - } - - received := make(map[string]bool) - var count int - - for i := 0; i < 10; i++ { - a, ok := <-ach - if !ok { - t.Fatal("channel shouldnt be closed yet") - } - if a == nil { - t.Fatal("got a nil address, thats weird") - } - count++ - if received[a.String()] { - t.Fatal("received duplicate address") - } - received[a.String()] = true - } - - select { - case <-ach: - t.Fatal("shouldnt have received any more addresses") - default: - } - - if count != 10 { - t.Fatal("should have received exactly ten addresses, got ", count) - } - - for _, a := range addrs { - if !received[a.String()] { - t.Log(received) - t.Fatalf("expected to receive address %s but didnt", a) - } - } - } -} - -func testAddrStreamDuplicates(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - addrs, pid := getAddrs(t, 10), peer.ID("testpeer") - - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - - ach := ps.AddrStream(ctx, pid) - go func() { - for i := 0; i < 10; i++ { - ps.AddAddr(pid, addrs[i], time.Hour) - ps.AddAddr(pid, addrs[rand.Intn(10)], time.Hour) - } - - // make sure that all addresses get processed before context is cancelled - time.Sleep(time.Millisecond * 50) - cancel() - }() - - received := make(map[string]bool) - var count int - for a := range ach { - if a == nil { - t.Fatal("got a nil address, thats weird") - } - count++ - if received[a.String()] { - t.Fatal("received duplicate address") - } - received[a.String()] = true - } - - if count != 10 { - t.Fatal("should have received exactly ten addresses") - } - } -} - -func testPeerstoreProtoStore(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - t.Run("adding and removing protocols", func(t *testing.T) { - p1 := peer.ID("TESTPEER") - protos := []string{"a", "b", "c", "d"} - - require.NoError(t, ps.AddProtocols(p1, protos...)) - out, err := ps.GetProtocols(p1) - require.NoError(t, err) - require.Len(t, out, len(protos), "got wrong number of protocols back") - - sort.Strings(out) - for i, p := range protos { - if out[i] != p { - t.Fatal("got wrong protocol") - } - } - - supported, err := ps.SupportsProtocols(p1, "q", "w", "a", "y", "b") - require.NoError(t, err) - require.Len(t, supported, 2, "only expected 2 supported") - - if supported[0] != "a" || supported[1] != "b" { - t.Fatal("got wrong supported array: ", supported) - } - - b, err := ps.FirstSupportedProtocol(p1, "q", "w", "a", "y", "b") - require.NoError(t, err) - require.Equal(t, "a", b) - - b, err = ps.FirstSupportedProtocol(p1, "q", "x", "z") - require.NoError(t, err) - require.Empty(t, b) - - b, err = ps.FirstSupportedProtocol(p1, "a") - require.NoError(t, err) - require.Equal(t, "a", b) - - protos = []string{"other", "yet another", "one more"} - require.NoError(t, ps.SetProtocols(p1, protos...)) - - supported, err = ps.SupportsProtocols(p1, "q", "w", "a", "y", "b") - require.NoError(t, err) - require.Empty(t, supported, "none of those protocols should have been supported") - - supported, err = ps.GetProtocols(p1) - require.NoError(t, err) - - sort.Strings(supported) - sort.Strings(protos) - if !reflect.DeepEqual(supported, protos) { - t.Fatalf("expected previously set protos; expected: %v, have: %v", protos, supported) - } - - require.NoError(t, ps.RemoveProtocols(p1, protos[:2]...)) - - supported, err = ps.GetProtocols(p1) - require.NoError(t, err) - if !reflect.DeepEqual(supported, protos[2:]) { - t.Fatal("expected only one protocol to remain") - } - }) - - t.Run("removing peer", func(t *testing.T) { - p := peer.ID("foobar") - protos := []string{"a", "b"} - - require.NoError(t, ps.SetProtocols(p, protos...)) - out, err := ps.GetProtocols(p) - require.NoError(t, err) - require.Len(t, out, 2) - ps.RemovePeer(p) - out, err = ps.GetProtocols(p) - require.NoError(t, err) - require.Empty(t, out) - }) - } -} - -func testBasicPeerstore(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - var pids []peer.ID - addrs := getAddrs(t, 10) - - for _, a := range addrs { - priv, _, err := crypto.GenerateKeyPair(crypto.RSA, 2048) - if err != nil { - t.Fatal(err) - } - p, err := peer.IDFromPrivateKey(priv) - if err != nil { - t.Fatal(err) - } - pids = append(pids, p) - ps.AddAddr(p, a, pstore.PermanentAddrTTL) - } - - peers := ps.Peers() - if len(peers) != 10 { - t.Fatal("expected ten peers, got", len(peers)) - } - - pinfo := ps.PeerInfo(pids[0]) - if !pinfo.Addrs[0].Equal(addrs[0]) { - t.Fatal("stored wrong address") - } - } -} - -func testMetadata(ps pstore.Peerstore) func(t *testing.T) { - return func(t *testing.T) { - t.Run("putting and getting", func(t *testing.T) { - pids := make([]peer.ID, 3) - for i := range pids { - priv, _, err := crypto.GenerateKeyPair(crypto.RSA, 2048) - require.NoError(t, err) - p, err := peer.IDFromPrivateKey(priv) - require.NoError(t, err) - pids[i] = p - } - for _, p := range pids { - require.NoError(t, ps.Put(p, "AgentVersion", "string"), "failed to put AgentVersion") - require.NoError(t, ps.Put(p, "bar", 1), "failed to put bar") - } - for _, p := range pids { - v, err := ps.Get(p, "AgentVersion") - require.NoError(t, err) - require.Equal(t, v, "string") - - v, err = ps.Get(p, "bar") - require.NoError(t, err) - require.Equal(t, v, 1) - } - }) - - t.Run("removing a peer", func(t *testing.T) { - p := peer.ID("foo") - otherP := peer.ID("foobar") - require.NoError(t, ps.Put(otherP, "AgentVersion", "v1")) - require.NoError(t, ps.Put(p, "AgentVersion", "v1")) - require.NoError(t, ps.Put(p, "bar", 1)) - ps.RemovePeer(p) - _, err := ps.Get(p, "AgentVersion") - require.ErrorIs(t, err, pstore.ErrNotFound) - _, err = ps.Get(p, "bar") - require.ErrorIs(t, err, pstore.ErrNotFound) - // make sure that entries for otherP were not deleted - val, err := ps.Get(otherP, "AgentVersion") - require.NoError(t, err) - require.Equal(t, val, "v1") - }) - } -} - -func testCertifiedAddrBook(ps pstore.Peerstore) func(*testing.T) { - return func(t *testing.T) { - _, ok := ps.(pstore.CertifiedAddrBook) - if !ok { - t.Error("expected peerstore to implement CertifiedAddrBook interface") - } - } -} - -func getAddrs(t *testing.T, n int) []ma.Multiaddr { - var addrs []ma.Multiaddr - for i := 0; i < n; i++ { - a, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", i)) - if err != nil { - t.Fatal(err) - } - - addrs = append(addrs, a) - } - return addrs -} - -func TestPeerstoreProtoStoreLimits(t *testing.T, ps pstore.Peerstore, limit int) { - p := peer.ID("foobar") - protocols := make([]string, limit) - for i := 0; i < limit; i++ { - protocols[i] = fmt.Sprintf("protocol %d", i) - } - - t.Run("setting protocols", func(t *testing.T) { - require.NoError(t, ps.SetProtocols(p, protocols...)) - require.EqualError(t, ps.SetProtocols(p, append(protocols, "proto")...), "too many protocols") - }) - t.Run("adding protocols", func(t *testing.T) { - p1 := protocols[:limit/2] - p2 := protocols[limit/2:] - require.NoError(t, ps.SetProtocols(p, p1...)) - require.NoError(t, ps.AddProtocols(p, p2...)) - require.EqualError(t, ps.AddProtocols(p, "proto"), "too many protocols") - }) -} diff --git a/test/utils.go b/test/utils.go deleted file mode 100644 index c169894..0000000 --- a/test/utils.go +++ /dev/null @@ -1,96 +0,0 @@ -package test - -import ( - "context" - "fmt" - "testing" - - peer "github.com/libp2p/go-libp2p-core/peer" - pt "github.com/libp2p/go-libp2p-core/test" - ma "github.com/multiformats/go-multiaddr" -) - -func Multiaddr(m string) ma.Multiaddr { - maddr, err := ma.NewMultiaddr(m) - if err != nil { - panic(err) - } - return maddr -} - -type peerpair struct { - ID peer.ID - Addr []ma.Multiaddr -} - -func RandomPeer(b *testing.B, addrCount int) *peerpair { - var ( - pid peer.ID - err error - addrs = make([]ma.Multiaddr, addrCount) - aFmt = "/ip4/127.0.0.1/tcp/%d/ipfs/%s" - ) - - b.Helper() - if pid, err = pt.RandPeerID(); err != nil { - b.Fatal(err) - } - - for i := 0; i < addrCount; i++ { - if addrs[i], err = ma.NewMultiaddr(fmt.Sprintf(aFmt, i, pid.Pretty())); err != nil { - b.Fatal(err) - } - } - return &peerpair{pid, addrs} -} - -func AddressProducer(ctx context.Context, b *testing.B, addrs chan *peerpair, addrsPerPeer int) { - b.Helper() - defer close(addrs) - for { - p := RandomPeer(b, addrsPerPeer) - select { - case addrs <- p: - case <-ctx.Done(): - return - } - } -} - -func GenerateAddrs(count int) []ma.Multiaddr { - var addrs = make([]ma.Multiaddr, count) - for i := 0; i < count; i++ { - addrs[i] = Multiaddr(fmt.Sprintf("/ip4/1.1.1.%d/tcp/1111", i)) - } - return addrs -} - -func GeneratePeerIDs(count int) []peer.ID { - var ids = make([]peer.ID, count) - for i := 0; i < count; i++ { - ids[i], _ = pt.RandPeerID() - } - return ids -} - -func AssertAddressesEqual(t *testing.T, exp, act []ma.Multiaddr) { - t.Helper() - if len(exp) != len(act) { - t.Fatalf("lengths not the same. expected %d, got %d\n", len(exp), len(act)) - } - - for _, a := range exp { - found := false - - for _, b := range act { - if a.Equal(b) { - found = true - break - } - } - - if !found { - t.Fatalf("expected address %s not found", a) - } - } -}