diff --git a/go.mod b/go.mod index 5a5a2230a..4f1c4808e 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/schollz/progressbar/v2 v2.15.0 github.com/shirou/gopsutil v2.20.5+incompatible github.com/sirupsen/logrus v1.6.0 - github.com/skycoin/dmsg v0.0.0-20201008074402-acbe6d76d785 + github.com/skycoin/dmsg v0.0.0-20201009105839-3b0627b4ffa6 github.com/skycoin/skycoin v0.26.0 github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 diff --git a/go.sum b/go.sum index 5b8fde766..1e5a10ae4 100644 --- a/go.sum +++ b/go.sum @@ -6,10 +6,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= 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 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/brotli v0.0.0-20190621154722-5f990b63d2d6 h1:bZ28Hqta7TFAK3Q08CMvv8y3/8ATaEqv2nGoc6yff6c= github.com/andybalholm/brotli v0.0.0-20190621154722-5f990b63d2d6/go.mod h1:+lx6/Aqd1kLJ1GQfkvOnaZ1WGmLpMpbprPuIOOZX30U= @@ -43,8 +41,6 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q= github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= -github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as= -github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= @@ -114,7 +110,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -163,10 +158,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061 h1:UCU8+cLbbvyxi0sQ9fSeoEhZgvrrD9HKMtX6Gmc1vk8= github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061/go.mod h1:wqKykBG2QzQDJEzvRkcS8x6MiSJkF52hXZsXcjaB3ls= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= 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 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nwaples/rardecode v1.0.0 h1:r7vGuS5akxOnR4JQSkko62RJ1ReCMXxQRPtxsiFMBOs= @@ -224,8 +217,10 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/skycoin/dmsg v0.0.0-20201008074402-acbe6d76d785 h1:wO5+dExw3a+eNPQk6cCPZnEP5P1KxBafADeWZEFQCrY= -github.com/skycoin/dmsg v0.0.0-20201008074402-acbe6d76d785/go.mod h1:xkd4GkAkPfwbbBDyp6rJoUWjPaV/Jj4bxAhsMTKO7ck= +github.com/skycoin/dmsg v0.0.0-20201009105839-3b0627b4ffa6 h1:JtzRwMrMS1k+RbwO07jxkrmKVHK/Gw5SWpuncoGtBqU= +github.com/skycoin/dmsg v0.0.0-20201009105839-3b0627b4ffa6/go.mod h1:xOXuvC+HWwOQsqlUAsf2alDnQPOmS+ecVlFS2YP3Qjk= +github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA= +github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o= github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f h1:A5dEM1OE9YhN3LciZU9qPjo7fJ46JeHNi3JCroDkK0Y= @@ -366,7 +361,6 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= 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= diff --git a/vendor/github.com/skycoin/dmsg/go.mod b/vendor/github.com/skycoin/dmsg/go.mod index 23de699eb..e8cc9bfc4 100644 --- a/vendor/github.com/skycoin/dmsg/go.mod +++ b/vendor/github.com/skycoin/dmsg/go.mod @@ -4,7 +4,6 @@ go 1.14 require ( github.com/creack/pty v1.1.9 - github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 github.com/go-redis/redis v6.15.6+incompatible github.com/gorilla/handlers v1.4.2 github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect @@ -16,6 +15,7 @@ require ( github.com/onsi/gomega v1.9.0 // indirect github.com/prometheus/client_golang v1.3.0 github.com/sirupsen/logrus v1.4.2 + github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 github.com/skycoin/skycoin v0.26.0 github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f github.com/spf13/cast v1.3.0 diff --git a/vendor/github.com/skycoin/dmsg/go.sum b/vendor/github.com/skycoin/dmsg/go.sum index 4923817ae..d3dba985a 100644 --- a/vendor/github.com/skycoin/dmsg/go.sum +++ b/vendor/github.com/skycoin/dmsg/go.sum @@ -30,8 +30,6 @@ 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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as= -github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -159,6 +157,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA= +github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o= github.com/skycoin/skycoin v0.26.0 h1:xDxe2r8AclMntZ550Y/vUQgwgLtwrf9Wu5UYiYcN5/o= github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw= github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f h1:A5dEM1OE9YhN3LciZU9qPjo7fJ46JeHNi3JCroDkK0Y= diff --git a/vendor/github.com/skycoin/dmsg/noise/dh.go b/vendor/github.com/skycoin/dmsg/noise/dh.go index 6da7ab693..22619517d 100644 --- a/vendor/github.com/skycoin/dmsg/noise/dh.go +++ b/vendor/github.com/skycoin/dmsg/noise/dh.go @@ -3,7 +3,7 @@ package noise import ( "io" - "github.com/flynn/noise" + "github.com/skycoin/noise" "github.com/skycoin/skycoin/src/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/noise/net.go b/vendor/github.com/skycoin/dmsg/noise/net.go index 52f83a1c8..c1c40fa00 100644 --- a/vendor/github.com/skycoin/dmsg/noise/net.go +++ b/vendor/github.com/skycoin/dmsg/noise/net.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/flynn/noise" + "github.com/skycoin/noise" "github.com/skycoin/dmsg/cipher" ) diff --git a/vendor/github.com/skycoin/dmsg/noise/noise.go b/vendor/github.com/skycoin/dmsg/noise/noise.go index 7b8b15a67..d4d6b58a9 100644 --- a/vendor/github.com/skycoin/dmsg/noise/noise.go +++ b/vendor/github.com/skycoin/dmsg/noise/noise.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/flynn/noise" + "github.com/skycoin/noise" "github.com/skycoin/skycoin/src/util/logging" "github.com/skycoin/dmsg/cipher" diff --git a/vendor/github.com/flynn/noise/.travis.yml b/vendor/github.com/skycoin/noise/.travis.yml similarity index 100% rename from vendor/github.com/flynn/noise/.travis.yml rename to vendor/github.com/skycoin/noise/.travis.yml diff --git a/vendor/github.com/flynn/noise/CONTRIBUTING.md b/vendor/github.com/skycoin/noise/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/flynn/noise/CONTRIBUTING.md rename to vendor/github.com/skycoin/noise/CONTRIBUTING.md diff --git a/vendor/github.com/flynn/noise/LICENSE b/vendor/github.com/skycoin/noise/LICENSE similarity index 100% rename from vendor/github.com/flynn/noise/LICENSE rename to vendor/github.com/skycoin/noise/LICENSE diff --git a/vendor/github.com/flynn/noise/README.md b/vendor/github.com/skycoin/noise/README.md similarity index 100% rename from vendor/github.com/flynn/noise/README.md rename to vendor/github.com/skycoin/noise/README.md diff --git a/vendor/github.com/flynn/noise/cipher_suite.go b/vendor/github.com/skycoin/noise/cipher_suite.go similarity index 100% rename from vendor/github.com/flynn/noise/cipher_suite.go rename to vendor/github.com/skycoin/noise/cipher_suite.go diff --git a/vendor/github.com/flynn/noise/hkdf.go b/vendor/github.com/skycoin/noise/hkdf.go similarity index 100% rename from vendor/github.com/flynn/noise/hkdf.go rename to vendor/github.com/skycoin/noise/hkdf.go diff --git a/vendor/github.com/flynn/noise/patterns.go b/vendor/github.com/skycoin/noise/patterns.go similarity index 100% rename from vendor/github.com/flynn/noise/patterns.go rename to vendor/github.com/skycoin/noise/patterns.go diff --git a/vendor/github.com/flynn/noise/state.go b/vendor/github.com/skycoin/noise/state.go similarity index 100% rename from vendor/github.com/flynn/noise/state.go rename to vendor/github.com/skycoin/noise/state.go diff --git a/vendor/github.com/flynn/noise/vectors.txt b/vendor/github.com/skycoin/noise/vectors.txt similarity index 100% rename from vendor/github.com/flynn/noise/vectors.txt rename to vendor/github.com/skycoin/noise/vectors.txt diff --git a/vendor/modules.txt b/vendor/modules.txt index f5ba2c045..554ff33bb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -24,8 +24,6 @@ github.com/dsnet/compress/bzip2/internal/sais github.com/dsnet/compress/internal github.com/dsnet/compress/internal/errors github.com/dsnet/compress/internal/prefix -# github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 -github.com/flynn/noise # github.com/go-chi/chi v4.1.2+incompatible ## explicit github.com/go-chi/chi @@ -151,7 +149,7 @@ github.com/shirou/gopsutil/process ## explicit github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/syslog -# github.com/skycoin/dmsg v0.0.0-20201008074402-acbe6d76d785 +# github.com/skycoin/dmsg v0.0.0-20201009105839-3b0627b4ffa6 ## explicit github.com/skycoin/dmsg github.com/skycoin/dmsg/buildinfo @@ -168,6 +166,8 @@ github.com/skycoin/dmsg/netutil github.com/skycoin/dmsg/noise github.com/skycoin/dmsg/promutil github.com/skycoin/dmsg/servermetrics +# github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 +github.com/skycoin/noise # github.com/skycoin/skycoin v0.26.0 ## explicit github.com/skycoin/skycoin/src/cipher