diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..97be2f5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,30 @@
+os:
+ - linux
+
+language: go
+
+go:
+ - 1.11.x
+
+env:
+ global:
+ - BUILD_DEPTYPE=gomod
+ matrix:
+ - GOTFLAGS="-race"
+ - GOTFLAGS="-race -tags=openssl"
+
+# disable travis install
+install:
+ - true
+
+script:
+ - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
+
+
+cache:
+ directories:
+ - $GOPATH/pkg/mod
+ - $HOME/.cache/go-build
+
+notifications:
+ email: false
diff --git a/README.md b/README.md
index c00d075..81c319d 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,3 @@ Check out the [GoDocs](https://godoc.org/github.com/libp2p/go-libp2p-core).
## License
Dual-licensed under MIT and ASLv2, by way of the [Permissive License Stack](https://protocol.ai/blog/announcing-the-permissive-license-stack/).
-
----
-
-The last gx published version of this module was: 2.0.19: QmaCTz9RkrU13bm9kMB54f7atgqM4qkjDZpRwRoJiWXEqs
diff --git a/crypto/key_test.go b/crypto/key_test.go
index a93fbf0..2a5e89a 100644
--- a/crypto/key_test.go
+++ b/crypto/key_test.go
@@ -7,7 +7,7 @@ import (
. "github.com/libp2p/go-libp2p-core/crypto"
pb "github.com/libp2p/go-libp2p-core/crypto/pb"
- "github.com/libp2p/go-libp2p-testing/crypto"
+ "github.com/libp2p/go-libp2p-core/test"
)
func TestKeys(t *testing.T) {
@@ -17,7 +17,7 @@ func TestKeys(t *testing.T) {
}
func testKeyType(typ int, t *testing.T) {
- sk, pk, err := tcrypto.RandTestKeyPair(typ, 512)
+ sk, pk, err := test.RandTestKeyPair(typ, 512)
if err != nil {
t.Fatal(err)
}
@@ -114,7 +114,7 @@ func testKeyEquals(t *testing.T, k Key) {
t.Fatal("Key not equal to key with same bytes.")
}
- sk, pk, err := tcrypto.RandTestKeyPair(RSA, 512)
+ sk, pk, err := test.RandTestKeyPair(RSA, 512)
if err != nil {
t.Fatal(err)
}
diff --git a/go.mod b/go.mod
index 08bddee..ad70bcb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,18 +1,17 @@
module github.com/libp2p/go-libp2p-core
require (
- github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32
+ github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c
github.com/coreos/go-semver v0.3.0
github.com/gogo/protobuf v1.2.1
- github.com/ipfs/go-cid v0.0.1
- github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8
+ github.com/ipfs/go-cid v0.0.2
+ github.com/jbenet/goprocess v0.1.3
github.com/libp2p/go-flow-metrics v0.0.1
- github.com/libp2p/go-libp2p-testing v0.0.0-20190508172549-1a0da3de1915
- github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16
- github.com/mr-tron/base58 v1.1.1
- github.com/multiformats/go-multiaddr v0.0.2
- github.com/multiformats/go-multihash v0.0.1
+ github.com/minio/sha256-simd v0.1.0
+ github.com/mr-tron/base58 v1.1.2
+ github.com/multiformats/go-multiaddr v0.0.4
+ github.com/multiformats/go-multihash v0.0.5
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a
go.opencensus.io v0.21.0
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
+ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
)
diff --git a/go.sum b/go.sum
index 87b0575..66e2dd1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,19 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 h1:qkOC5Gd33k54tobS36cXdAzJbeHaduLtnLQQwNoIi78=
-github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
+github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c h1:aEbSeNALREWXk0G7UdNhR3ayBV7tZ4M2PNmnrCAph6Q=
+github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd h1:qdGvebPBDuYDPGi1WCPjy1tGyMpmDK8IEapSsszn7HE=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723 h1:ZA/jbKoGcVAnER6pCHPEkGdZOV7U1oLUedErBHCUMs0=
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -30,35 +36,44 @@ github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmv
github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ipfs/go-cid v0.0.1 h1:GBjWPktLnNyX0JiQCNFpUuUSoMw5KMyqrsejHYlILBE=
-github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8 h1:bspPhN+oKYFk5fcGNuQzp6IGzYQSenLEgH3s6jkXrWw=
-github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
+github.com/ipfs/go-cid v0.0.2 h1:tuuKaZPU1M6HcejsO3AcYWW8sZ8MTvyxfc4uqB4eFE8=
+github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
+github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
+github.com/jbenet/goprocess v0.1.3 h1:YKyIEECS/XvcfHtBzxtjBBbWK+MbvA6dG8ASiqwvr10=
+github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89 h1:12K8AlpT0/6QUXSfV0yi4Q0jkbq8NDtIKFtF61AoqV0=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI=
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
+github.com/kisielk/errcheck v1.1.0 h1:ZqfnKyx9KGpRcW04j5nnPDgRgoXUeLh2YFBeFzphcA0=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE=
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
github.com/libp2p/go-flow-metrics v0.0.1 h1:0gxuFd2GuK7IIP5pKljLwps6TvcuYgvG7Atqi3INF5s=
github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
-github.com/libp2p/go-libp2p-core v0.0.0-20190508144953-ed42958fbb3a/go.mod h1:U1aaQsPt97g1BVcfdLEnzHdSNbaSg3Gh5eKgJ/KunKg=
-github.com/libp2p/go-libp2p-testing v0.0.0-20190508172549-1a0da3de1915 h1:ut3tAnP5cOMPZbUHEEhKnvJaJGorIUOdqz+UBC45T/g=
-github.com/libp2p/go-libp2p-testing v0.0.0-20190508172549-1a0da3de1915/go.mod h1:1FFj6xmoClrgHPBxgUgSSYWYxJ6CdkoP+s+sFf8nVgo=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 h1:5W7KhL8HVF3XCFOweFD3BNESdnO8ewyYTFT2R+/b8FQ=
github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
+github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5 h1:l16XLUUJ34wIz+RIvLhSwGvLvKyy+W598b135bJN6mg=
+github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
+github.com/minio/sha256-simd v0.1.0 h1:U41/2erhAKcmSI14xh/ZTUdBPOzDOIfS93ibzUSl8KM=
+github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.1 h1:OJIdWOWYe2l5PQNgimGtuwHY8nDskvJ5vvs//YnzRLs=
-github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
+github.com/mr-tron/base58 v1.1.2 h1:ZEw4I2EgPKDJ2iEw0cNmLB3ROrEmkOtXIkaG7wZg+78=
+github.com/mr-tron/base58 v1.1.2/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-multiaddr v0.0.2 h1:RBysRCv5rv3FWlhKWKoXv8tnsCUpEpIZpCmqAGZos2s=
-github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
+github.com/multiformats/go-multiaddr v0.0.4 h1:WgMSI84/eRLdbptXMkMWDXPjPq7SPLIgGUVm2eroyU4=
+github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
github.com/multiformats/go-multibase v0.0.1 h1:PN9/v21eLywrFWdFNsFKaU04kLJzuYzmrJR+ubhT9qA=
github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
github.com/multiformats/go-multihash v0.0.1 h1:HHwN1K12I+XllBCrqKnhX949Orn4oawPkegHMu2vDqQ=
github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
+github.com/multiformats/go-multihash v0.0.5 h1:1wxmCvTXAifAepIMyF39vZinRw5sbqjPs/UIi93+uik=
+github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -66,10 +81,17 @@ github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a h1:/eS3yfGjQ
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
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 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/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-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
+golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc=
+golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b h1:+/WWzjwW6gidDJnMKWLKLX1gxn7irUTF1fLpQovfQ5M=
golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
@@ -80,6 +102,7 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -92,7 +115,10 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190219092855-153ac476189d h1:Z0Ahzd7HltpJtjAHHxX8QFP3j1yYgiuvjbjRzDj/KH0=
golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635 h1:2eB4G6bDQDeP69ZXbOKC00S2Kf6TIiRS+DzfKsKeQU0=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/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=
diff --git a/peer/addrinfo.go b/peer/addrinfo.go
index c7324e4..6423d84 100644
--- a/peer/addrinfo.go
+++ b/peer/addrinfo.go
@@ -2,7 +2,6 @@ package peer
import (
"fmt"
- "strings"
ma "github.com/multiformats/go-multiaddr"
)
@@ -22,52 +21,71 @@ func (pi AddrInfo) String() string {
var ErrInvalidAddr = fmt.Errorf("invalid p2p multiaddr")
-func AddrInfoFromP2pAddr(m ma.Multiaddr) (*AddrInfo, error) {
+// AddrInfosFromP2pAddrs converts a set of Multiaddrs to a set of AddrInfos.
+func AddrInfosFromP2pAddrs(maddrs ...ma.Multiaddr) ([]AddrInfo, error) {
+ m := make(map[ID][]ma.Multiaddr)
+ for _, maddr := range maddrs {
+ transport, id := SplitAddr(maddr)
+ if id == "" {
+ return nil, ErrInvalidAddr
+ }
+ if transport == nil {
+ if _, ok := m[id]; !ok {
+ m[id] = nil
+ }
+ } else {
+ m[id] = append(m[id], transport)
+ }
+ }
+ ais := make([]AddrInfo, 0, len(m))
+ for id, maddrs := range m {
+ ais = append(ais, AddrInfo{ID: id, Addrs: maddrs})
+ }
+ return ais, nil
+}
+
+// SplitAddr splits a p2p Multiaddr into a transport multiaddr and a peer ID.
+//
+// * Returns a nil transport if the address only contains a /p2p part.
+// * Returns a empty peer ID if the address doesn't contain a /p2p part.
+func SplitAddr(m ma.Multiaddr) (transport ma.Multiaddr, id ID) {
if m == nil {
- return nil, ErrInvalidAddr
+ return nil, ""
}
- // make sure it's a P2P addr
- parts := ma.Split(m)
- if len(parts) < 1 {
+ transport, p2ppart := ma.SplitLast(m)
+ if p2ppart == nil || p2ppart.Protocol().Code != ma.P_P2P {
+ return m, ""
+ }
+ id = ID(p2ppart.RawValue()) // already validated by the multiaddr library.
+ return transport, id
+}
+
+// AddrInfoFromP2pAddr converts a Multiaddr to an AddrInfo.
+func AddrInfoFromP2pAddr(m ma.Multiaddr) (*AddrInfo, error) {
+ transport, id := SplitAddr(m)
+ if id == "" {
return nil, ErrInvalidAddr
}
-
- // TODO(lgierth): we shouldn't assume /p2p is the last part
- p2ppart := parts[len(parts)-1]
- if p2ppart.Protocols()[0].Code != ma.P_P2P {
- return nil, ErrInvalidAddr
+ info := &AddrInfo{ID: id}
+ if transport != nil {
+ info.Addrs = []ma.Multiaddr{transport}
}
+ return info, nil
+}
- // make sure the /p2p value parses as a peer.ID
- peerIdParts := strings.Split(p2ppart.String(), "/")
- peerIdStr := peerIdParts[len(peerIdParts)-1]
- id, err := IDB58Decode(peerIdStr)
+// AddrInfoToP2pAddr converts an AddrInfo to a list of Multiaddrs.
+func AddrInfoToP2pAddrs(pi *AddrInfo) ([]ma.Multiaddr, error) {
+ var addrs []ma.Multiaddr
+ p2ppart, err := ma.NewComponent("p2p", IDB58Encode(pi.ID))
if err != nil {
return nil, err
}
-
- // we might have received just an /p2p part, which means there's no addr.
- var addrs []ma.Multiaddr
- if len(parts) > 1 {
- addrs = append(addrs, ma.Join(parts[:len(parts)-1]...))
+ if len(pi.Addrs) == 0 {
+ return []ma.Multiaddr{p2ppart}, nil
}
-
- return &AddrInfo{
- ID: id,
- Addrs: addrs,
- }, nil
-}
-
-func AddrInfoToP2pAddrs(pi *AddrInfo) ([]ma.Multiaddr, error) {
- var addrs []ma.Multiaddr
- tpl := "/" + ma.ProtocolWithCode(ma.P_P2P).Name + "/"
for _, addr := range pi.Addrs {
- p2paddr, err := ma.NewMultiaddr(tpl + IDB58Encode(pi.ID))
- if err != nil {
- return nil, err
- }
- addrs = append(addrs, addr.Encapsulate(p2paddr))
+ addrs = append(addrs, addr.Encapsulate(p2ppart))
}
return addrs, nil
}
diff --git a/peer/addrinfo_test.go b/peer/addrinfo_test.go
new file mode 100644
index 0000000..b902fdf
--- /dev/null
+++ b/peer/addrinfo_test.go
@@ -0,0 +1,135 @@
+package peer_test
+
+import (
+ "testing"
+
+ ma "github.com/multiformats/go-multiaddr"
+
+ . "github.com/libp2p/go-libp2p-core/peer"
+)
+
+var (
+ testID ID
+ maddrFull, maddrTpt, maddrPeer ma.Multiaddr
+)
+
+func init() {
+ var err error
+ testID, err = IDB58Decode("QmS3zcG7LhYZYSJMhyRZvTddvbNUqtt8BJpaSs6mi1K5Va")
+ if err != nil {
+ panic(err)
+ }
+ maddrPeer = ma.StringCast("/p2p/" + IDB58Encode(testID))
+ maddrTpt = ma.StringCast("/ip4/127.0.0.1/tcp/1234")
+ maddrFull = maddrTpt.Encapsulate(maddrPeer)
+}
+
+func TestSplitAddr(t *testing.T) {
+ tpt, id := SplitAddr(maddrFull)
+ if !tpt.Equal(maddrTpt) {
+ t.Fatal("expected transport")
+ }
+ if id != testID {
+ t.Fatalf("%s != %s", id, testID)
+ }
+
+ tpt, id = SplitAddr(maddrPeer)
+ if tpt != nil {
+ t.Fatal("expected no transport")
+ }
+ if id != testID {
+ t.Fatalf("%s != %s", id, testID)
+ }
+
+ tpt, id = SplitAddr(maddrTpt)
+ if !tpt.Equal(maddrTpt) {
+ t.Fatal("expected a transport")
+ }
+ if id != "" {
+ t.Fatal("expected no peer ID")
+ }
+}
+
+func TestAddrInfoFromP2pAddr(t *testing.T) {
+ ai, err := AddrInfoFromP2pAddr(maddrFull)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(ai.Addrs) != 1 || !ai.Addrs[0].Equal(maddrTpt) {
+ t.Fatal("expected transport")
+ }
+ if ai.ID != testID {
+ t.Fatalf("%s != %s", ai.ID, testID)
+ }
+
+ ai, err = AddrInfoFromP2pAddr(maddrPeer)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(ai.Addrs) != 0 {
+ t.Fatal("expected transport")
+ }
+ if ai.ID != testID {
+ t.Fatalf("%s != %s", ai.ID, testID)
+ }
+
+ _, err = AddrInfoFromP2pAddr(maddrTpt)
+ if err != ErrInvalidAddr {
+ t.Fatalf("wrong error: %s", err)
+ }
+}
+
+func TestAddrInfosFromP2pAddrs(t *testing.T) {
+ infos, err := AddrInfosFromP2pAddrs()
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(infos) != 0 {
+ t.Fatal("expected no addrs")
+ }
+ infos, err = AddrInfosFromP2pAddrs(nil)
+ if err == nil {
+ t.Fatal("expected nil multiaddr to fail")
+ }
+
+ addrs := []ma.Multiaddr{
+ ma.StringCast("/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"),
+ ma.StringCast("/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"),
+
+ ma.StringCast("/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"),
+ ma.StringCast("/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"),
+
+ ma.StringCast("/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"),
+ }
+ expected := map[string][]ma.Multiaddr{
+ "QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64": {
+ ma.StringCast("/ip4/128.199.219.111/tcp/4001"),
+ ma.StringCast("/ip4/104.236.76.40/tcp/4001"),
+ },
+ "QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd": {
+ ma.StringCast("/ip4/178.62.158.247/tcp/4001"),
+ },
+ "QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM": nil,
+ }
+ infos, err = AddrInfosFromP2pAddrs(addrs...)
+ if err != nil {
+ t.Fatal(err)
+ }
+ for _, info := range infos {
+ exaddrs, ok := expected[info.ID.Pretty()]
+ if !ok {
+ t.Fatalf("didn't expect peer %s", info.ID)
+ }
+ if len(info.Addrs) != len(exaddrs) {
+ t.Fatalf("got %d addrs, expected %d", len(info.Addrs), len(exaddrs))
+ }
+ // AddrInfosFromP2pAddrs preserves order. I'd like to keep this
+ // guarantee for now.
+ for i, addr := range info.Addrs {
+ if !exaddrs[i].Equal(addr) {
+ t.Fatalf("expected %s, got %s", exaddrs[i], addr)
+ }
+ }
+ delete(expected, info.ID.Pretty())
+ }
+}
diff --git a/peer/peer_serde_test.go b/peer/peer_serde_test.go
index 62ecb0f..8a52ba9 100644
--- a/peer/peer_serde_test.go
+++ b/peer/peer_serde_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/libp2p/go-libp2p-core/peer"
- . "github.com/libp2p/go-libp2p-testing/peer"
+ . "github.com/libp2p/go-libp2p-core/test"
)
func TestPeerSerdePB(t *testing.T) {
diff --git a/peer/peer_test.go b/peer/peer_test.go
index a134532..41f323d 100644
--- a/peer/peer_test.go
+++ b/peer/peer_test.go
@@ -8,10 +8,8 @@ import (
"testing"
ic "github.com/libp2p/go-libp2p-core/crypto"
- "github.com/libp2p/go-libp2p-testing/crypto"
-
. "github.com/libp2p/go-libp2p-core/peer"
- "github.com/libp2p/go-libp2p-testing/peer"
+ "github.com/libp2p/go-libp2p-core/test"
b58 "github.com/mr-tron/base58/base58"
mh "github.com/multiformats/go-multihash"
@@ -49,7 +47,7 @@ type keyset struct {
func (ks *keyset) generate() error {
var err error
- ks.sk, ks.pk, err = tcrypto.RandTestKeyPair(ic.RSA, 512)
+ ks.sk, ks.pk, err = test.RandTestKeyPair(ic.RSA, 512)
if err != nil {
return err
}
@@ -217,7 +215,7 @@ func TestValidate(t *testing.T) {
}
// Non-empty peer ID validates
- p, err := tpeer.RandPeerID()
+ p, err := test.RandPeerID()
if err != nil {
t.Fatal(err)
}
diff --git a/test/crypto.go b/test/crypto.go
new file mode 100644
index 0000000..931eae9
--- /dev/null
+++ b/test/crypto.go
@@ -0,0 +1,25 @@
+package test
+
+import (
+ "math/rand"
+ "sync/atomic"
+ "time"
+
+ ci "github.com/libp2p/go-libp2p-core/crypto"
+)
+
+var generatedPairs int64 = 0
+
+func RandTestKeyPair(typ, bits int) (ci.PrivKey, ci.PubKey, error) {
+ seed := time.Now().UnixNano()
+
+ // workaround for low time resolution
+ seed += atomic.AddInt64(&generatedPairs, 1) << 32
+
+ return SeededTestKeyPair(typ, bits, time.Now().UnixNano())
+}
+
+func SeededTestKeyPair(typ, bits int, seed int64) (ci.PrivKey, ci.PubKey, error) {
+ r := rand.New(rand.NewSource(seed))
+ return ci.GenerateKeyPairWithReader(typ, bits, r)
+}
diff --git a/test/peer.go b/test/peer.go
new file mode 100644
index 0000000..9d78989
--- /dev/null
+++ b/test/peer.go
@@ -0,0 +1,30 @@
+package test
+
+import (
+ "io"
+ "math/rand"
+ "testing"
+ "time"
+
+ "github.com/libp2p/go-libp2p-core/peer"
+
+ mh "github.com/multiformats/go-multihash"
+)
+
+func RandPeerID() (peer.ID, error) {
+ r := rand.New(rand.NewSource(time.Now().UnixNano()))
+ buf := make([]byte, 16)
+ if _, err := io.ReadFull(r, buf); err != nil {
+ return "", err
+ }
+ h, _ := mh.Sum(buf, mh.SHA2_256, -1)
+ return peer.ID(h), nil
+}
+
+func RandPeerIDFatal(t testing.TB) peer.ID {
+ p, err := RandPeerID()
+ if err != nil {
+ t.Fatal(err)
+ }
+ return p
+}