From 587fd148cab61518c34ed8577c660ecce1bec49f Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Wed, 6 Jul 2022 16:29:20 -0400 Subject: [PATCH] chore: use static rln lib and fix lint --- .gitmodules | 3 --- Makefile | 2 +- examples/basic2/go.mod | 3 +++ examples/basic2/go.sum | 6 ++---- examples/chat2/go.mod | 5 ++--- examples/chat2/go.sum | 5 ++--- examples/chat2/main.go | 2 +- examples/filter2/go.mod | 3 +++ examples/filter2/go.sum | 6 ++---- go.mod | 6 ++---- go.sum | 7 ++++--- third-party/go-rln | 1 - waku/node.go | 1 + waku/v2/node/wakunode2.go | 2 +- waku/v2/node/wakuoptions.go | 2 +- waku/v2/protocol/rln/rln_relay_builder.go | 2 +- waku/v2/protocol/rln/rln_relay_test.go | 2 +- waku/v2/protocol/rln/waku_rln_relay.go | 2 +- 18 files changed, 28 insertions(+), 32 deletions(-) delete mode 160000 third-party/go-rln diff --git a/.gitmodules b/.gitmodules index cec124f3..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "third-party/go-rln"] - path = third-party/go-rln - url = git@github.com:status-im/go-rln.git diff --git a/Makefile b/Makefile index ec2a19fd..320fdf95 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ vendor: lint-install: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \ - bash -s -- -b $(shell ${GOBIN} env GOPATH)/bin v1.41.1 + bash -s -- -b $(shell ${GOBIN} env GOPATH)/bin v1.46.2 lint: @echo "lint" diff --git a/examples/basic2/go.mod b/examples/basic2/go.mod index a01e14a1..8883cee0 100644 --- a/examples/basic2/go.mod +++ b/examples/basic2/go.mod @@ -6,6 +6,8 @@ replace github.com/status-im/go-waku => ../.. replace github.com/ethereum/go-ethereum v1.10.18 => github.com/status-im/go-ethereum v1.10.4-status.2 +replace github.com/flynn/noise v1.0.0 => github.com/status-im/noise v1.0.1-handshakeMessages + require ( github.com/ethereum/go-ethereum v1.10.20 github.com/ipfs/go-log v1.0.5 @@ -109,6 +111,7 @@ require ( github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e // indirect + github.com/status-im/go-rln v0.0.7 // indirect github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect diff --git a/examples/basic2/go.sum b/examples/basic2/go.sum index 61a46788..09995d54 100644 --- a/examples/basic2/go.sum +++ b/examples/basic2/go.sum @@ -528,7 +528,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/ethereum/go-ethereum v1.9.5/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= @@ -539,8 +538,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= -github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1661,7 +1658,8 @@ github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e/go.mod h1:u1 github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 h1:cbNFU38iimo9fY4B7CdF/fvIF6tNPJIZjBbpfmW2EY4= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432/go.mod h1:A8t3i0CUGtXCA0aiLsP7iyikmk/KaD/2XVvNJqGCU20= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/status-im/status-go/extkeys v1.1.2/go.mod h1:hCmFzb2jiiVF2voZKYbzuhOQiHHCmyLJsZJXrFFg7BY= +github.com/status-im/noise v1.0.1-handshakeMessages h1:mj1btE58Qk2pS0qz+BHE22HYIOhZoEFNTnRpQeMfHYk= +github.com/status-im/noise v1.0.1-handshakeMessages/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= diff --git a/examples/chat2/go.mod b/examples/chat2/go.mod index 1aed28c3..a25b3f89 100644 --- a/examples/chat2/go.mod +++ b/examples/chat2/go.mod @@ -6,8 +6,6 @@ replace github.com/status-im/go-waku => ../.. replace github.com/ethereum/go-ethereum v1.10.18 => github.com/status-im/go-ethereum v1.10.4-status.2 -replace github.com/decanus/go-rln => github.com/status-im/go-rln v0.0.6 - replace github.com/flynn/noise v1.0.0 => github.com/status-im/noise v1.0.1-handshakeMessages require ( @@ -23,7 +21,7 @@ require ( google.golang.org/protobuf v1.28.0 ) -require github.com/decanus/go-rln v0.0.0-20210914163037-e0e31478e351 +require github.com/status-im/go-rln v0.0.7 require ( github.com/benbjohnson/clock v1.3.0 // indirect @@ -81,6 +79,7 @@ require ( github.com/libp2p/go-openssl v0.0.7 // indirect github.com/libp2p/go-reuseport v0.2.0 // indirect github.com/libp2p/go-yamux/v3 v3.1.2 // indirect + github.com/libp2p/go-stream-muxer-multistream v0.4.0 // indirect github.com/lucas-clemente/quic-go v0.27.1 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect diff --git a/examples/chat2/go.sum b/examples/chat2/go.sum index bd8b8a8e..6f52a9e3 100644 --- a/examples/chat2/go.sum +++ b/examples/chat2/go.sum @@ -526,7 +526,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/ethereum/go-ethereum v1.9.5/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= @@ -1671,8 +1670,8 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc= github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e h1:fDm8hqKGFy8LMNV8zedT3W+QYVPVDfb0F9Fr7fVf9rQ= github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e/go.mod h1:u1s0ACIlweIjmJrgXyljRPSOflZLaS6ezb044+92W3c= -github.com/status-im/go-rln v0.0.6 h1:/9IKDEIJAUEpIRDNP65/mSfHGjpAxPfghKFb1U2O99o= -github.com/status-im/go-rln v0.0.6/go.mod h1:X8j1STGa0vtbvZ4AZibPmk9cCI4FafO0+6zhaomgfNI= +github.com/status-im/go-rln v0.0.7 h1:YhP0iCQIT9C6jGEE5VW2Z7ene1Du0XhQ6JAzgFC3u/8= +github.com/status-im/go-rln v0.0.7/go.mod h1:t8Bf4nNAuQh9VlEiz/rgFVtEz7sjEfcd62MIuEnZn8U= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 h1:cbNFU38iimo9fY4B7CdF/fvIF6tNPJIZjBbpfmW2EY4= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432/go.mod h1:A8t3i0CUGtXCA0aiLsP7iyikmk/KaD/2XVvNJqGCU20= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= diff --git a/examples/chat2/main.go b/examples/chat2/main.go index 4466d4e0..91e81ab7 100644 --- a/examples/chat2/main.go +++ b/examples/chat2/main.go @@ -13,11 +13,11 @@ import ( "os" "time" - "github.com/decanus/go-rln/rln" "github.com/ethereum/go-ethereum/crypto" logging "github.com/ipfs/go-log" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/protocol" + "github.com/status-im/go-rln/rln" wakuprotocol "github.com/status-im/go-waku/waku/v2/protocol" "github.com/status-im/go-waku/waku/v2/utils" diff --git a/examples/filter2/go.mod b/examples/filter2/go.mod index 6c812f16..97a27cbe 100644 --- a/examples/filter2/go.mod +++ b/examples/filter2/go.mod @@ -6,6 +6,8 @@ replace github.com/status-im/go-waku => ../.. replace github.com/ethereum/go-ethereum v1.10.18 => github.com/status-im/go-ethereum v1.10.4-status.2 +replace github.com/flynn/noise v1.0.0 => github.com/status-im/noise v1.0.1-handshakeMessages + require ( github.com/ethereum/go-ethereum v1.10.20 github.com/ipfs/go-log v1.0.5 @@ -109,6 +111,7 @@ require ( github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e // indirect + github.com/status-im/go-rln v0.0.7 // indirect github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect diff --git a/examples/filter2/go.sum b/examples/filter2/go.sum index 61a46788..09995d54 100644 --- a/examples/filter2/go.sum +++ b/examples/filter2/go.sum @@ -528,7 +528,6 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/ethereum/go-ethereum v1.9.5/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJv9Ln3kPCZLwY= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= @@ -539,8 +538,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= -github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -1661,7 +1658,8 @@ github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e/go.mod h1:u1 github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 h1:cbNFU38iimo9fY4B7CdF/fvIF6tNPJIZjBbpfmW2EY4= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432/go.mod h1:A8t3i0CUGtXCA0aiLsP7iyikmk/KaD/2XVvNJqGCU20= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= -github.com/status-im/status-go/extkeys v1.1.2/go.mod h1:hCmFzb2jiiVF2voZKYbzuhOQiHHCmyLJsZJXrFFg7BY= +github.com/status-im/noise v1.0.1-handshakeMessages h1:mj1btE58Qk2pS0qz+BHE22HYIOhZoEFNTnRpQeMfHYk= +github.com/status-im/noise v1.0.1-handshakeMessages/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= diff --git a/go.mod b/go.mod index cf804fcd..9cbab322 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,6 @@ replace github.com/ethereum/go-ethereum v1.10.18 => github.com/status-im/go-ethe replace github.com/flynn/noise v1.0.0 => github.com/status-im/noise v1.0.1-handshakeMessages -replace github.com/decanus/go-rln => github.com/status-im/go-rln v0.0.6 - require ( contrib.go.opencensus.io/exporter/prometheus v0.4.1 github.com/btcsuite/btcd/btcec/v2 v2.2.0 @@ -33,16 +31,16 @@ require ( github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 github.com/stretchr/testify v1.7.2 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a - github.com/urfave/cli/v2 v2.10.2 + github.com/urfave/cli/v2 v2.10.3 go.opencensus.io v0.23.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 ) require ( - github.com/decanus/go-rln v0.0.0-20210914163037-e0e31478e351 github.com/flynn/noise v1.0.0 github.com/gorilla/mux v1.8.0 + github.com/status-im/go-rln v0.0.7 golang.org/x/text v0.3.7 ) diff --git a/go.sum b/go.sum index e9435ef9..9e5268f8 100644 --- a/go.sum +++ b/go.sum @@ -1682,8 +1682,8 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc= github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e h1:fDm8hqKGFy8LMNV8zedT3W+QYVPVDfb0F9Fr7fVf9rQ= github.com/status-im/go-discover v0.0.0-20220406135310-85a2ce36f63e/go.mod h1:u1s0ACIlweIjmJrgXyljRPSOflZLaS6ezb044+92W3c= -github.com/status-im/go-rln v0.0.6 h1:/9IKDEIJAUEpIRDNP65/mSfHGjpAxPfghKFb1U2O99o= -github.com/status-im/go-rln v0.0.6/go.mod h1:X8j1STGa0vtbvZ4AZibPmk9cCI4FafO0+6zhaomgfNI= +github.com/status-im/go-rln v0.0.7 h1:YhP0iCQIT9C6jGEE5VW2Z7ene1Du0XhQ6JAzgFC3u/8= +github.com/status-im/go-rln v0.0.7/go.mod h1:t8Bf4nNAuQh9VlEiz/rgFVtEz7sjEfcd62MIuEnZn8U= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432 h1:cbNFU38iimo9fY4B7CdF/fvIF6tNPJIZjBbpfmW2EY4= github.com/status-im/go-waku-rendezvous v0.0.0-20211018070416-a93f3b70c432/go.mod h1:A8t3i0CUGtXCA0aiLsP7iyikmk/KaD/2XVvNJqGCU20= github.com/status-im/go-watchdog v1.2.0-ios-nolibproc h1:BJwZEF7OVKaXc2zErBUAolFSGzwrTBbWnN8e/6MER5E= @@ -1740,8 +1740,9 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= +github.com/urfave/cli/v2 v2.10.3 h1:oi571Fxz5aHugfBAJd5nkwSk3fzATXtMlpxdLylSCMo= +github.com/urfave/cli/v2 v2.10.3/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= diff --git a/third-party/go-rln b/third-party/go-rln deleted file mode 160000 index 429ea1c1..00000000 --- a/third-party/go-rln +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 429ea1c12a86c2ef14c706cb2f4c01ce02e03ae2 diff --git a/waku/node.go b/waku/node.go index d003f908..ec459b40 100644 --- a/waku/node.go +++ b/waku/node.go @@ -18,6 +18,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p/enode" dssql "github.com/ipfs/go-ds-sql" + "github.com/status-im/go-rln/rln" "github.com/urfave/cli/v2" "go.uber.org/zap" diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go index 1e9ae13f..a6bac9fe 100644 --- a/waku/v2/node/wakunode2.go +++ b/waku/v2/node/wakunode2.go @@ -24,7 +24,7 @@ import ( ma "github.com/multiformats/go-multiaddr" "go.opencensus.io/stats" - r "github.com/decanus/go-rln/rln" + r "github.com/status-im/go-rln/rln" rendezvous "github.com/status-im/go-waku-rendezvous" "github.com/status-im/go-waku/logging" "github.com/status-im/go-waku/waku/try" diff --git a/waku/v2/node/wakuoptions.go b/waku/v2/node/wakuoptions.go index 4790bb1f..add0d2bb 100644 --- a/waku/v2/node/wakuoptions.go +++ b/waku/v2/node/wakuoptions.go @@ -8,7 +8,6 @@ import ( "net" "time" - r "github.com/decanus/go-rln/rln" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/crypto" @@ -22,6 +21,7 @@ import ( "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" + r "github.com/status-im/go-rln/rln" rendezvous "github.com/status-im/go-waku-rendezvous" "github.com/status-im/go-waku/waku/v2/protocol/filter" "github.com/status-im/go-waku/waku/v2/protocol/rln" diff --git a/waku/v2/protocol/rln/rln_relay_builder.go b/waku/v2/protocol/rln/rln_relay_builder.go index 45d3c06b..dbba1091 100644 --- a/waku/v2/protocol/rln/rln_relay_builder.go +++ b/waku/v2/protocol/rln/rln_relay_builder.go @@ -3,7 +3,7 @@ package rln import ( "errors" - r "github.com/decanus/go-rln/rln" + r "github.com/status-im/go-rln/rln" "github.com/status-im/go-waku/waku/v2/protocol/relay" "go.uber.org/zap" ) diff --git a/waku/v2/protocol/rln/rln_relay_test.go b/waku/v2/protocol/rln/rln_relay_test.go index cde07688..3c4da1d8 100644 --- a/waku/v2/protocol/rln/rln_relay_test.go +++ b/waku/v2/protocol/rln/rln_relay_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - r "github.com/decanus/go-rln/rln" + r "github.com/status-im/go-rln/rln" "github.com/status-im/go-waku/tests" "github.com/status-im/go-waku/waku/v2/protocol/pb" "github.com/status-im/go-waku/waku/v2/protocol/relay" diff --git a/waku/v2/protocol/rln/waku_rln_relay.go b/waku/v2/protocol/rln/waku_rln_relay.go index 5e240380..ba4db86f 100644 --- a/waku/v2/protocol/rln/waku_rln_relay.go +++ b/waku/v2/protocol/rln/waku_rln_relay.go @@ -9,11 +9,11 @@ import ( "math" "time" - r "github.com/decanus/go-rln/rln" "github.com/ethereum/go-ethereum/common" proto "github.com/golang/protobuf/proto" "github.com/libp2p/go-libp2p-core/peer" pubsub "github.com/libp2p/go-libp2p-pubsub" + r "github.com/status-im/go-rln/rln" "github.com/status-im/go-waku/waku/v2/protocol/pb" "github.com/status-im/go-waku/waku/v2/protocol/relay" "go.uber.org/zap"